prettier

docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-slack.md

@@ -43,7 +43,7 @@ There are two ways of integrating Slack into Grafana Alerting.
 
 Note that you can only setup one Slack channel per contact point.
 
-You can customize the `title` and `body` of the Slack message using [notification templates](ref:notification-templates); however, you cannot modify its visual appearance with custom blocks.
+You can customize the `title` and `body` of the Slack message using [notification templates](ref:notification-templates); however, you cannot modify its visual appearance with custom blocks. Additional optional settings are available to customize bot appearance, mentions, and message formatting. Refer to the [Optional settings](#optional-settings) section for more details.
 
 ## Before you begin
 
@@ -83,6 +83,47 @@ To create your Slack integration in Grafana Alerting, complete the following ste
 
 1. Click **Save contact point**.
 
+## Optional settings
+
+You can configure additional settings to customize your Slack notifications beyond the required fields.
+
+### Customize bot appearance
+
+You can customize how the bot appears in Slack channels:
+
+- **Username**: Override the default bot username that appears in Slack. Set the `username` field to customize the display name.
+- **Icon emoji**: Provide an emoji to use as the icon for the message. Set the `icon_emoji` field (for example, `:rocket:`). This overrides the icon URL.
+- **Icon URL**: Provide a URL to an image to use as the icon for the message. Set the `icon_url` field with the image URL.
+
+### Configure mentions
+
+You can automatically mention users, groups, or the entire channel when notifications are sent:
+
+- **Mention users**: Mention one or more specific users in the notification. Set the `mentionUsers` field with a comma-separated list of user IDs (for example, `U024BE7LH,U024BE7LJ`). To find a user's ID, refer to [Slack's documentation on finding member IDs](https://api.slack.com/methods/users.list).
+
+- **Mention groups**: Mention one or more user groups in the notification. Set the `mentionGroups` field with a comma-separated list of group IDs. You can copy group IDs from the group's Slack profile URL.
+
+- **Mention channel**: Mention the entire channel or active members. Set the `mentionChannel` field to one of the following:
+  - Empty or omit the field to disable channel mentions
+  - `here` to mention every active channel member
+  - `channel` to mention every channel member
+
+### Customize message content
+
+You can customize the notification message using [notification templates](ref:notification-templates):
+
+- **Title**: Set a custom title for the Slack message. Use the `title` field with template variables (for example, `{{ template "slack.default.title" . }}`).
+
+- **Text body**: Set a custom body text for the Slack message. Use the `text` field with template variables (for example, `{{ template "slack.default.text" . }}`).
+
+- **Color**: Set the color of the vertical bar on the left side of the message attachment. Use the `color` field with either:
+
+### Advanced configuration
+
+For specialized environments, you can override the default Slack API endpoint:
+
+- **Endpoint URL**: Specify a custom Slack API endpoint for non-webhook requests. Set the `endpointUrl` field to your custom endpoint. The default is `https://slack.com/api/chat.postMessage`.
+
 ## Next steps
 
 The Slack contact point is ready to receive alert notifications.

go.mod

@@ -70,7 +70,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.1 // @grafana/oss-big-tent
 	github.com/go-openapi/loads v0.23.1 // @grafana/alerting-backend
 	github.com/go-openapi/runtime v0.28.0 // @grafana/alerting-backend
-	github.com/go-openapi/strfmt v0.25.0 // @grafana/alerting-backend
+	github.com/go-openapi/strfmt v0.24.0 // @grafana/alerting-backend
 	github.com/go-redis/redis/v8 v8.11.5 // indirect; @grafana/grafana-backend-group
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible // @grafana/grafana-backend-group
 	github.com/go-sql-driver/mysql v1.9.3 // @grafana/grafana-search-and-storage
@@ -341,6 +341,7 @@ require (
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/at-wat/mqtt-go v0.19.6 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.31.17 // indirect
@@ -429,7 +430,7 @@ require (
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.24.0 // indirect
-	github.com/go-openapi/errors v0.22.4 // indirect
+	github.com/go-openapi/errors v0.22.3 // indirect
 	github.com/go-openapi/jsonpointer v0.22.4 // indirect
 	github.com/go-openapi/jsonreference v0.21.4 // indirect
 	github.com/go-openapi/spec v0.22.0 // indirect
@@ -606,7 +607,7 @@ require (
 	go.etcd.io/etcd/api/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
 	go.etcd.io/etcd/client/v3 v3.6.6 // indirect
-	go.mongodb.org/mongo-driver v1.17.6 // indirect
+	go.mongodb.org/mongo-driver v1.17.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.44.0 // indirect
 	go.opentelemetry.io/collector/semconv v0.124.0 // indirect

go.sum

@@ -840,6 +840,7 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+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.6 h1:+jo59yGHB3oqBU8nSFYbq6KDgN4ngMpqts5Qtyq61pc=
 github.com/at-wat/mqtt-go v0.19.6/go.mod h1:Y/YrYwUlLE4N53//699Zir3WJnxSdJojvLEAbZxJjgQ=
@@ -1283,8 +1284,8 @@ github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQH
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/errors v0.21.0/go.mod h1:jxNTMUxRCKj65yb/okJGEtahVd7uvWnuWfj53bse4ho=
-github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM=
-github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
+github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs=
+github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
@@ -1330,8 +1331,8 @@ github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+Z
 github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
 github.com/go-openapi/strfmt v0.21.10/go.mod h1:vNDMwbilnl7xKiO/Ve/8H8Bb2JIInBnH+lqiw6QWgis=
 github.com/go-openapi/strfmt v0.22.0/go.mod h1:HzJ9kokGIju3/K6ap8jL+OlGAbjpSv27135Yr9OivU4=
-github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ=
-github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8=
+github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc=
+github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
@@ -2633,8 +2634,8 @@ go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qL
 go.mongodb.org/mongo-driver v1.0.4/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
-go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
-go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
+go.mongodb.org/mongo-driver v1.17.4/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.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=

packages/grafana-ui/src/components/RadialGauge/RadialArcPath.tsx

@@ -1,9 +1,8 @@
-import { useId, memo, HTMLAttributes, SVGProps } from 'react';
+import { useId, memo, HTMLAttributes, ReactNode, SVGProps } from 'react';
 
 import { FieldDisplay } from '@grafana/data';
 
-import { RadialArcPathEndpointMarks } from './RadialArcPathEndpointMarks';
-import { getBarEndcapColors, getGradientCss } from './colors';
+import { getBarEndcapColors, getGradientCss, getEndpointMarkerColors } from './colors';
 import { RadialShape, RadialGaugeDimensions, GradientStop } from './types';
 import { drawRadialArcPath, toRad } from './utils';
 
@@ -30,6 +29,11 @@ interface RadialArcPathPropsWithGradient extends RadialArcPathPropsBase {
 
 type RadialArcPathProps = RadialArcPathPropsWithColor | RadialArcPathPropsWithGradient;
 
+const ENDPOINT_MARKER_MIN_ANGLE = 10;
+const DOT_OPACITY = 0.5;
+const DOT_RADIUS_FACTOR = 0.4;
+const MAX_DOT_RADIUS = 8;
+
 export const RadialArcPath = memo(
   ({
     arcLengthDeg,
@@ -64,25 +68,67 @@ export const RadialArcPath = memo(
     const xEnd = centerX + radius * Math.cos(endRadians);
     const yEnd = centerY + radius * Math.sin(endRadians);
 
+    const dotRadius =
+      endpointMarker === 'point' ? Math.min((barWidth / 2) * DOT_RADIUS_FACTOR, MAX_DOT_RADIUS) : barWidth / 2;
+
     const bgDivStyle: HTMLAttributes<HTMLDivElement>['style'] = { width: boxSize, height: vizHeight, marginLeft: boxX };
+
     const pathProps: SVGProps<SVGPathElement> = {};
+    let barEndcapColors: [string, string] | undefined;
+    let endpointMarks: ReactNode = null;
     if (isGradient) {
       bgDivStyle.backgroundImage = getGradientCss(rest.gradient, shape);
+
+      if (endpointMarker && (rest.gradient?.length ?? 0) > 0) {
+        switch (endpointMarker) {
+          case 'point':
+            const [pointColorStart, pointColorEnd] = getEndpointMarkerColors(
+              rest.gradient!,
+              fieldDisplay.display.percent
+            );
+            endpointMarks = (
+              <>
+                {arcLengthDeg > ENDPOINT_MARKER_MIN_ANGLE && (
+                  <circle cx={xStart} cy={yStart} r={dotRadius} fill={pointColorStart} opacity={DOT_OPACITY} />
+                )}
+                <circle cx={xEnd} cy={yEnd} r={dotRadius} fill={pointColorEnd} opacity={DOT_OPACITY} />
+              </>
+            );
+            break;
+          case 'glow':
+            const offsetAngle = toRad(ENDPOINT_MARKER_MIN_ANGLE);
+            const xStartMark = centerX + radius * Math.cos(endRadians + offsetAngle);
+            const yStartMark = centerY + radius * Math.sin(endRadians + offsetAngle);
+            endpointMarks =
+              arcLengthDeg > ENDPOINT_MARKER_MIN_ANGLE ? (
+                <path
+                  d={['M', xStartMark, yStartMark, 'A', radius, radius, 0, 0, 1, xEnd, yEnd].join(' ')}
+                  fill="none"
+                  strokeWidth={barWidth}
+                  stroke={endpointMarkerGlowFilter}
+                  strokeLinecap={roundedBars ? 'round' : 'butt'}
+                  filter={glowFilter}
+                />
+              ) : null;
+            break;
+          default:
+            break;
+        }
+      }
+
+      if (barEndcaps) {
+        barEndcapColors = getBarEndcapColors(rest.gradient, fieldDisplay.display.percent);
+      }
+
       pathProps.fill = 'none';
       pathProps.stroke = 'white';
     } else {
       bgDivStyle.backgroundColor = rest.color;
+
       pathProps.fill = 'none';
       pathProps.stroke = rest.color;
     }
 
-    let barEndcapColors: [string, string] | undefined;
-    if (barEndcaps) {
-      barEndcapColors = isGradient
-        ? getBarEndcapColors(rest.gradient, fieldDisplay.display.percent)
-        : [rest.color, rest.color];
-    }
-
     const pathEl = (
       <path d={path} strokeWidth={barWidth} strokeLinecap={roundedBars ? 'round' : 'butt'} {...pathProps} />
     );
@@ -112,23 +158,7 @@ export const RadialArcPath = memo(
           )}
         </g>
 
-        {endpointMarker && (
-          <RadialArcPathEndpointMarks
-            startAngle={angle}
-            arcLengthDeg={arcLengthDeg}
-            dimensions={dimensions}
-            endpointMarker={endpointMarker}
-            fieldDisplay={fieldDisplay}
-            xStart={xStart}
-            xEnd={xEnd}
-            yStart={yStart}
-            yEnd={yEnd}
-            roundedBars={roundedBars}
-            endpointMarkerGlowFilter={endpointMarkerGlowFilter}
-            glowFilter={glowFilter}
-            {...rest}
-          />
-        )}
+        {endpointMarks}
       </>
     );
   }

packages/grafana-ui/src/components/RadialGauge/RadialArcPathEndpointMarks.test.tsx

@@ -1,143 +0,0 @@
-import { render, RenderResult } from '@testing-library/react';
-
-import { FieldDisplay } from '@grafana/data';
-
-import { RadialArcPathEndpointMarks, RadialArcPathEndpointMarksProps } from './RadialArcPathEndpointMarks';
-import { RadialGaugeDimensions } from './types';
-
-const ser = new XMLSerializer();
-
-const expectHTML = (result: RenderResult, expected: string) => {
-  let actual = ser.serializeToString(result.asFragment()).replace(/xmlns=".*?" /g, '');
-  expect(actual).toEqual(expected.replace(/^\s*|\n/gm, ''));
-};
-
-describe('RadialArcPathEndpointMarks', () => {
-  const defaultDimensions = Object.freeze({
-    centerX: 100,
-    centerY: 100,
-    radius: 80,
-    barWidth: 20,
-    vizWidth: 200,
-    vizHeight: 200,
-    margin: 10,
-    barIndex: 0,
-    thresholdsBarRadius: 0,
-    thresholdsBarWidth: 0,
-    thresholdsBarSpacing: 0,
-    scaleLabelsFontSize: 0,
-    scaleLabelsSpacing: 0,
-    scaleLabelsRadius: 0,
-    gaugeBottomY: 0,
-  }) satisfies RadialGaugeDimensions;
-
-  const defaultFieldDisplay = Object.freeze({
-    name: 'Test',
-    field: {},
-    display: { text: '50', numeric: 50, color: '#FF0000' },
-    hasLinks: false,
-  }) satisfies FieldDisplay;
-
-  const defaultProps = Object.freeze({
-    arcLengthDeg: 90,
-    dimensions: defaultDimensions,
-    fieldDisplay: defaultFieldDisplay,
-    startAngle: 0,
-    xStart: 100,
-    xEnd: 150,
-    yStart: 100,
-    yEnd: 50,
-  }) satisfies Omit<RadialArcPathEndpointMarksProps, 'color' | 'gradient' | 'endpointMarker'>;
-
-  it('renders the expected marks when endpointMarker is "point" w/ a static color', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks {...defaultProps} endpointMarker="point" color="#FF0000" />
-        </svg>
-      ),
-      '<svg role=\"img\"><circle cx=\"100\" cy=\"100\" r=\"4\" fill=\"#111217\" opacity=\"0.5\"/><circle cx=\"150\" cy=\"50\" r=\"4\" fill=\"#111217\" opacity=\"0.5\"/></svg>'
-    );
-  });
-
-  it('renders the expected marks when endpointMarker is "point" w/ a gradient color', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks
-            {...defaultProps}
-            endpointMarker="point"
-            gradient={[
-              { color: '#00FF00', percent: 0 },
-              { color: '#0000FF', percent: 1 },
-            ]}
-          />
-        </svg>
-      ),
-      '<svg role=\"img\"><circle cx=\"100\" cy=\"100\" r=\"4\" fill=\"#111217\" opacity=\"0.5\"/><circle cx=\"150\" cy=\"50\" r=\"4\" fill=\"#fbfbfb\" opacity=\"0.5\"/></svg>'
-    );
-  });
-
-  it('renders the expected marks when endpointMarker is "glow" w/ a static color', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks {...defaultProps} endpointMarker="glow" color="#FF0000" />
-        </svg>
-      ),
-      '<svg role=\"img\"><path d=\"M 113.89185421335443 21.215379759023364 A 80 80 0 0 1 150 50\" fill=\"none\" stroke-width=\"20\" stroke-linecap=\"butt\"/></svg>'
-    );
-  });
-
-  it('renders the expected marks when endpointMarker is "glow" w/ a gradient color', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks
-            {...defaultProps}
-            endpointMarker="glow"
-            gradient={[
-              { color: '#00FF00', percent: 0 },
-              { color: '#0000FF', percent: 1 },
-            ]}
-          />
-        </svg>
-      ),
-      '<svg role=\"img\"><path d=\"M 113.89185421335443 21.215379759023364 A 80 80 0 0 1 150 50\" fill=\"none\" stroke-width=\"20\" stroke-linecap=\"butt\"/></svg>'
-    );
-  });
-
-  it('does not render the start mark when arcLengthDeg is less than the minimum angle for "point" endpointMarker', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks {...defaultProps} arcLengthDeg={5} endpointMarker="point" color="#FF0000" />
-        </svg>
-      ),
-      '<svg role=\"img\"><circle cx=\"150\" cy=\"50\" r=\"4\" fill=\"#111217\" opacity=\"0.5\"/></svg>'
-    );
-  });
-
-  it('does not render anything when arcLengthDeg is less than the minimum angle for "glow" endpointMarker', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          <RadialArcPathEndpointMarks {...defaultProps} arcLengthDeg={5} endpointMarker="glow" color="#FF0000" />
-        </svg>
-      ),
-      '<svg role=\"img\"/>'
-    );
-  });
-
-  it('does not render anything if endpointMarker is some other value', () => {
-    expectHTML(
-      render(
-        <svg role="img">
-          {/* @ts-ignore: confirming the component doesn't throw */}
-          <RadialArcPathEndpointMarks {...defaultProps} endpointMarker="foo" />
-        </svg>
-      ),
-      '<svg role=\"img\"/>'
-    );
-  });
-});

packages/grafana-ui/src/components/RadialGauge/RadialArcPathEndpointMarks.tsx

@@ -1,98 +0,0 @@
-import { FieldDisplay } from '@grafana/data';
-
-import { getEndpointMarkerColors, getGuideDotColor } from './colors';
-import { GradientStop, RadialGaugeDimensions } from './types';
-import { toRad } from './utils';
-
-interface RadialArcPathEndpointMarksPropsBase {
-  arcLengthDeg: number;
-  dimensions: RadialGaugeDimensions;
-  fieldDisplay: FieldDisplay;
-  endpointMarker: 'point' | 'glow';
-  roundedBars?: boolean;
-  startAngle: number;
-  glowFilter?: string;
-  endpointMarkerGlowFilter?: string;
-  xStart: number;
-  xEnd: number;
-  yStart: number;
-  yEnd: number;
-}
-
-interface RadialArcPathEndpointMarksPropsWithColor extends RadialArcPathEndpointMarksPropsBase {
-  color: string;
-}
-
-interface RadialArcPathEndpointMarksPropsWithGradient extends RadialArcPathEndpointMarksPropsBase {
-  gradient: GradientStop[];
-}
-
-export type RadialArcPathEndpointMarksProps =
-  | RadialArcPathEndpointMarksPropsWithColor
-  | RadialArcPathEndpointMarksPropsWithGradient;
-
-const ENDPOINT_MARKER_MIN_ANGLE = 10;
-const DOT_OPACITY = 0.5;
-const DOT_RADIUS_FACTOR = 0.4;
-const MAX_DOT_RADIUS = 8;
-
-export function RadialArcPathEndpointMarks({
-  startAngle: angle,
-  arcLengthDeg,
-  dimensions,
-  endpointMarker,
-  fieldDisplay,
-  xStart,
-  xEnd,
-  yStart,
-  yEnd,
-  roundedBars,
-  endpointMarkerGlowFilter,
-  glowFilter,
-  ...rest
-}: RadialArcPathEndpointMarksProps) {
-  const isGradient = 'gradient' in rest;
-  const { radius, centerX, centerY, barWidth } = dimensions;
-  const endRadians = toRad(angle + arcLengthDeg);
-
-  switch (endpointMarker) {
-    case 'point': {
-      const [pointColorStart, pointColorEnd] = isGradient
-        ? getEndpointMarkerColors(rest.gradient, fieldDisplay.display.percent)
-        : [getGuideDotColor(rest.color), getGuideDotColor(rest.color)];
-
-      const dotRadius =
-        endpointMarker === 'point' ? Math.min((barWidth / 2) * DOT_RADIUS_FACTOR, MAX_DOT_RADIUS) : barWidth / 2;
-
-      return (
-        <>
-          {arcLengthDeg > ENDPOINT_MARKER_MIN_ANGLE && (
-            <circle cx={xStart} cy={yStart} r={dotRadius} fill={pointColorStart} opacity={DOT_OPACITY} />
-          )}
-          <circle cx={xEnd} cy={yEnd} r={dotRadius} fill={pointColorEnd} opacity={DOT_OPACITY} />
-        </>
-      );
-    }
-    case 'glow':
-      const offsetAngle = toRad(ENDPOINT_MARKER_MIN_ANGLE);
-      const xStartMark = centerX + radius * Math.cos(endRadians + offsetAngle);
-      const yStartMark = centerY + radius * Math.sin(endRadians + offsetAngle);
-      if (arcLengthDeg <= ENDPOINT_MARKER_MIN_ANGLE) {
-        break;
-      }
-      return (
-        <path
-          d={['M', xStartMark, yStartMark, 'A', radius, radius, 0, 0, 1, xEnd, yEnd].join(' ')}
-          fill="none"
-          strokeWidth={barWidth}
-          stroke={endpointMarkerGlowFilter}
-          strokeLinecap={roundedBars ? 'round' : 'butt'}
-          filter={glowFilter}
-        />
-      );
-    default:
-      break;
-  }
-
-  return null;
-}

packages/grafana-ui/src/components/RadialGauge/colors.ts

@@ -175,7 +175,7 @@ export function getGradientCss(gradientStops: GradientStop[], shape: RadialShape
 const GRAY_05 = '#111217';
 const GRAY_90 = '#fbfbfb';
 const CONTRAST_THRESHOLD_MAX = 4.5;
-export const getGuideDotColor = (color: string): string => {
+const getGuideDotColor = (color: string): string => {
   const darkColor = GRAY_05;
   const lightColor = GRAY_90;
   return colorManipulator.getContrastRatio(darkColor, color) >= CONTRAST_THRESHOLD_MAX ? darkColor : lightColor;

public/locales/cs-CZ/grafana.json

@@ -3791,6 +3791,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4453,7 +4454,6 @@
       },
       "no-properties-changed": "Žádné relevantní vlastnosti se nezměnily",
       "table": {
-        "notes": "",
         "updated": "Datum",
         "updatedBy": "Aktualizoval uživatel",
         "version": "Verze"
@@ -4912,8 +4912,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Hodnoty oddělené čárkou"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filtr názvu",
@@ -6011,9 +6010,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Vlastní možnosti",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Hodnoty oddělené čárkou",
       "selection-options": "Možnosti výběru"
     },
@@ -6605,11 +6601,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Nástěnka byla uložena"
     },
@@ -6633,7 +6624,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6693,11 +6683,8 @@
       "tooltip-show-usages": "Zobrazit použití"
     },
     "variable-values-preview": {
-      "show-more": "Zobrazit více",
-      "preview-of-values_one": "",
-      "preview-of-values_few": "",
-      "preview-of-values_many": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Náhled hodnot",
+      "show-more": "Zobrazit více"
     },
     "version-history": {
       "comparison": {

public/locales/de-DE/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Keine relevanten Eigenschaften geändert",
       "table": {
-        "notes": "",
         "updated": "Datum",
         "updatedBy": "Aktualisiert von",
         "version": "Version"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Werte werden durch Komma getrennt"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Namensfilter",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Benutzerdefinierte Optionen",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Werte werden durch Komma getrennt",
       "selection-options": "Auswahloptionen"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Dashboard gespeichert"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Nutzungen anzeigen"
     },
     "variable-values-preview": {
-      "show-more": "Mehr anzeigen",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Vorschau der Werte",
+      "show-more": "Mehr anzeigen"
     },
     "version-history": {
       "comparison": {

public/locales/es-ES/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "No se ha cambiado ninguna propiedad relevante",
       "table": {
-        "notes": "",
         "updated": "Fecha",
         "updatedBy": "Actualizada por",
         "version": "Versión"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Valores separados por coma"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Nombrar filtro",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opciones personalizadas",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Valores separados por comas",
       "selection-options": "Opciones de selección"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Dashboard guardado"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Mostrar usos"
     },
     "variable-values-preview": {
-      "show-more": "Mostrar más",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Vista previa de los valores",
+      "show-more": "Mostrar más"
     },
     "version-history": {
       "comparison": {

public/locales/fr-FR/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Aucune propriété pertinente n’a été modifiée",
       "table": {
-        "notes": "",
         "updated": "Date",
         "updatedBy": "Mis à jour par",
         "version": "Version"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Valeurs séparées par une virgule"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Nom du filtre",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Personnaliser les options",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Valeurs séparées par des virgules",
       "selection-options": "Options de sélection"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Tableau de bord enregistré"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Afficher les usages"
     },
     "variable-values-preview": {
-      "show-more": "Afficher plus",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Aperçu des valeurs",
+      "show-more": "Afficher plus"
     },
     "version-history": {
       "comparison": {

public/locales/hu-HU/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Nem változtak meg a releváns tulajdonságok",
       "table": {
-        "notes": "",
         "updated": "Dátum",
         "updatedBy": "Frissítette:",
         "version": "Verzió"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Értékek vesszővel elválasztva"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Névszűrő",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Egyéni opciók",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Értékek vesszővel elválasztva",
       "selection-options": "Kijelölés beállításai"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Irányítópult elmentve"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Használatok megjelenítése"
     },
     "variable-values-preview": {
-      "show-more": "Több megjelenítése",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Értékek előnézete",
+      "show-more": "Több megjelenítése"
     },
     "version-history": {
       "comparison": {

public/locales/id-ID/grafana.json

@@ -3743,6 +3743,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4396,7 +4397,6 @@
       },
       "no-properties-changed": "Tidak ada properti yang relevan yang diubah",
       "table": {
-        "notes": "",
         "updated": "Tanggal",
         "updatedBy": "Diperbarui Oleh",
         "version": "Versi"
@@ -4855,8 +4855,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Nilai dipisahkan dengan koma"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filter nama",
@@ -5948,9 +5947,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opsi kustom",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Nilai dipisahkan dengan koma",
       "selection-options": "Opsi pemilihan"
     },
@@ -6536,11 +6532,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Dasbor disimpan"
     },
@@ -6564,7 +6555,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6624,8 +6614,8 @@
       "tooltip-show-usages": "Tampilkan penggunaan"
     },
     "variable-values-preview": {
-      "show-more": "Tampilkan lebih banyak",
-      "preview-of-values_other": ""
+      "preview-of-values": "Pratinjau nilai",
+      "show-more": "Tampilkan lebih banyak"
     },
     "version-history": {
       "comparison": {

public/locales/it-IT/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Nessuna proprietà rilevante modificata",
       "table": {
-        "notes": "",
         "updated": "Data",
         "updatedBy": "Aggiornato da",
         "version": "Versione"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Valori separati da virgola"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filtro nome",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opzioni personalizzate",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Valori separati da virgola",
       "selection-options": "Seleziona opzioni"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Dashboard salvata"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Mostra utilizzi"
     },
     "variable-values-preview": {
-      "show-more": "Mostra di più",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Anteprima dei valori",
+      "show-more": "Mostra di più"
     },
     "version-history": {
       "comparison": {

public/locales/ja-JP/grafana.json

@@ -3743,6 +3743,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4396,7 +4397,6 @@
       },
       "no-properties-changed": "関連するプロパティは変更されていません",
       "table": {
-        "notes": "",
         "updated": "日付",
         "updatedBy": "更新者",
         "version": "バージョン"
@@ -4855,8 +4855,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "カンマで区切った値"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "名前フィルター",
@@ -5948,9 +5947,6 @@
     },
     "custom-variable-form": {
       "custom-options": "カスタムオプション",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "カンマ区切りの値",
       "selection-options": "選択オプション"
     },
@@ -6536,11 +6532,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "ダッシュボードが保存されました"
     },
@@ -6564,7 +6555,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6624,8 +6614,8 @@
       "tooltip-show-usages": "使用状況を表示"
     },
     "variable-values-preview": {
-      "show-more": "さらに表示",
-      "preview-of-values_other": ""
+      "preview-of-values": "値のプレビュー",
+      "show-more": "さらに表示"
     },
     "version-history": {
       "comparison": {

public/locales/ko-KR/grafana.json

@@ -3743,6 +3743,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4396,7 +4397,6 @@
       },
       "no-properties-changed": "변경된 관련 속성 없음",
       "table": {
-        "notes": "",
         "updated": "날짜",
         "updatedBy": "업데이트한 사용자",
         "version": "버전"
@@ -4855,8 +4855,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "쉼표로 구분된 값"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "이름 필터",
@@ -5948,9 +5947,6 @@
     },
     "custom-variable-form": {
       "custom-options": "사용자 지정 옵션",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "쉼표로 구분된 값",
       "selection-options": "선택 옵션"
     },
@@ -6536,11 +6532,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "대시보드가 저장되었습니다"
     },
@@ -6564,7 +6555,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6624,8 +6614,8 @@
       "tooltip-show-usages": "사용처 표시"
     },
     "variable-values-preview": {
-      "show-more": "더 보기",
-      "preview-of-values_other": ""
+      "preview-of-values": "값 미리 보기",
+      "show-more": "더 보기"
     },
     "version-history": {
       "comparison": {

public/locales/nl-NL/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Geen relevante eigenschappen gewijzigd",
       "table": {
-        "notes": "",
         "updated": "Datum",
         "updatedBy": "Bijgewerkt door",
         "version": "Versie"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Waarden gescheiden door komma"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filter een naam geven",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Aangepaste opties",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Waarden gescheiden door komma",
       "selection-options": "Selectiemogelijkheden"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Dashboard opgeslagen"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Gebruik weergeven"
     },
     "variable-values-preview": {
-      "show-more": "Meer weergeven",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Voorbeeldweergave van waarden",
+      "show-more": "Meer weergeven"
     },
     "version-history": {
       "comparison": {

public/locales/pl-PL/grafana.json

@@ -3791,6 +3791,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4453,7 +4454,6 @@
       },
       "no-properties-changed": "Nie zmieniono istotnych właściwości",
       "table": {
-        "notes": "",
         "updated": "Data",
         "updatedBy": "Zaktualizowane przez",
         "version": "Wersja"
@@ -4912,8 +4912,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Wartości rozdzielone przecinkami"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filtr nazwy",
@@ -6011,9 +6010,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opcje niestandardowe",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Wartości rozdzielone przecinkami",
       "selection-options": "Opcje wyboru"
     },
@@ -6605,11 +6601,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Pulpit został zapisany"
     },
@@ -6633,7 +6624,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6693,11 +6683,8 @@
       "tooltip-show-usages": "Wyświetl użycie"
     },
     "variable-values-preview": {
-      "show-more": "Pokaż więcej",
-      "preview-of-values_one": "",
-      "preview-of-values_few": "",
-      "preview-of-values_many": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Podgląd wartości",
+      "show-more": "Pokaż więcej"
     },
     "version-history": {
       "comparison": {

public/locales/pt-BR/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Nenhuma propriedade relevante alterada",
       "table": {
-        "notes": "",
         "updated": "Data",
         "updatedBy": "Atualizada por",
         "version": "Versão"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Valores separados por vírgula"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filtro de nome",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Valores separados por vírgula",
       "selection-options": "Opções de seleção"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Painel de controle salvo"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Exibir usos"
     },
     "variable-values-preview": {
-      "show-more": "Exibir mais",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Pré-visualização de valores",
+      "show-more": "Exibir mais"
     },
     "version-history": {
       "comparison": {

public/locales/pt-PT/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Nenhuma propriedade relevante alterada",
       "table": {
-        "notes": "",
         "updated": "Data",
         "updatedBy": "Atualizado por",
         "version": "Versão"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Valores separados por vírgulas"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Filtro de nome",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Opções personalizadas",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Valores separados por vírgulas",
       "selection-options": "Opções de seleção"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Painel de controlo guardado"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Mostrar utilizações"
     },
     "variable-values-preview": {
-      "show-more": "Mostrar mais",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Pré-visualização de valores",
+      "show-more": "Mostrar mais"
     },
     "version-history": {
       "comparison": {

public/locales/ru-RU/grafana.json

@@ -3791,6 +3791,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4453,7 +4454,6 @@
       },
       "no-properties-changed": "Нет изменений соответствующих свойств",
       "table": {
-        "notes": "",
         "updated": "Дата",
         "updatedBy": "Обновлено",
         "version": "Версия"
@@ -4912,8 +4912,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Значения, разделенные запятыми"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Фильтр по названию",
@@ -6011,9 +6010,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Пользовательские параметры",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Значения, разделенные запятыми",
       "selection-options": "Параметры выбора"
     },
@@ -6605,11 +6601,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Дашборд сохранен"
     },
@@ -6633,7 +6624,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6693,11 +6683,8 @@
       "tooltip-show-usages": "Показать варианты использования"
     },
     "variable-values-preview": {
-      "show-more": "Показать еще",
-      "preview-of-values_one": "",
-      "preview-of-values_few": "",
-      "preview-of-values_many": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Просмотр значений",
+      "show-more": "Показать еще"
     },
     "version-history": {
       "comparison": {

public/locales/sv-SE/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "Inga relevanta egenskaper har ändrats",
       "table": {
-        "notes": "",
         "updated": "Datum",
         "updatedBy": "Uppdaterad per",
         "version": "Version"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Värden åtskilda med kommatecken"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Namnfilter",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Anpassade alternativ",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Värden åtskilda med kommatecken",
       "selection-options": "Urvalsalternativ"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Kontrollpanelen sparades"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Visa användningar"
     },
     "variable-values-preview": {
-      "show-more": "Visa mer",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Förhandsgranska värden",
+      "show-more": "Visa mer"
     },
     "version-history": {
       "comparison": {

public/locales/tr-TR/grafana.json

@@ -3759,6 +3759,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4415,7 +4416,6 @@
       },
       "no-properties-changed": "İlgili hiçbir özellik değiştirilmedi",
       "table": {
-        "notes": "",
         "updated": "Tarih",
         "updatedBy": "Güncelleyen:",
         "version": "Sürüm"
@@ -4874,8 +4874,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "Virgülle ayrılmış değerler"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "Ad filtresi",
@@ -5969,9 +5968,6 @@
     },
     "custom-variable-form": {
       "custom-options": "Özel seçenekler",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "Virgülle ayrılmış değerler",
       "selection-options": "Seçim ayarları"
     },
@@ -6559,11 +6555,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "Pano kaydedildi"
     },
@@ -6587,7 +6578,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6647,9 +6637,8 @@
       "tooltip-show-usages": "Kullanımları göster"
     },
     "variable-values-preview": {
-      "show-more": "Daha fazla göster",
-      "preview-of-values_one": "",
-      "preview-of-values_other": ""
+      "preview-of-values": "Değerlerin ön izlemesi",
+      "show-more": "Daha fazla göster"
     },
     "version-history": {
       "comparison": {

public/locales/zh-Hans/grafana.json

@@ -3743,6 +3743,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4396,7 +4397,6 @@
       },
       "no-properties-changed": "没有相关属性更改",
       "table": {
-        "notes": "",
         "updated": "日期",
         "updatedBy": "更新者",
         "version": "版本"
@@ -4855,8 +4855,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "以逗号分隔的值"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "名称筛选器",
@@ -5948,9 +5947,6 @@
     },
     "custom-variable-form": {
       "custom-options": "自定义选项",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "以逗号分隔的值",
       "selection-options": "选择内容选项"
     },
@@ -6536,11 +6532,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "数据面板已保存"
     },
@@ -6564,7 +6555,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6624,8 +6614,8 @@
       "tooltip-show-usages": "显示使用情况"
     },
     "variable-values-preview": {
-      "show-more": "显示更多",
-      "preview-of-values_other": ""
+      "preview-of-values": "值预览",
+      "show-more": "显示更多"
     },
     "version-history": {
       "comparison": {

public/locales/zh-Hant/grafana.json

@@ -3743,6 +3743,7 @@
     },
     "recently-viewed": {
       "clear": "",
+      "empty": "",
       "error": "",
       "retry": "",
       "title": ""
@@ -4396,7 +4397,6 @@
       },
       "no-properties-changed": "沒有相關的屬性變更",
       "table": {
-        "notes": "",
         "updated": "日期",
         "updatedBy": "更新者",
         "version": "版本"
@@ -4855,8 +4855,7 @@
           "apply": "",
           "change-value": "",
           "discard": "",
-          "modal-title": "",
-          "values": "以逗號分隔的值"
+          "modal-title": ""
         },
         "datasource-options": {
           "name-filter": "名稱篩選",
@@ -5948,9 +5947,6 @@
     },
     "custom-variable-form": {
       "custom-options": "自訂選項",
-      "json-values-tooltip": "",
-      "name-csv-values": "",
-      "name-json-values": "",
       "name-values-separated-comma": "以逗號分隔的值",
       "selection-options": "選擇選項"
     },
@@ -6536,11 +6532,6 @@
         }
       }
     },
-    "use-modal-editor": {
-      "description": {
-        "change-variable-query": ""
-      }
-    },
     "use-save-dashboard": {
       "message-dashboard-saved": "儀表板已儲存"
     },
@@ -6564,7 +6555,6 @@
           "label": ""
         },
         "hidden": {
-          "description": "",
           "label": ""
         },
         "hidden-label": {
@@ -6624,8 +6614,8 @@
       "tooltip-show-usages": "顯示使用情況"
     },
     "variable-values-preview": {
-      "show-more": "顯示更多",
-      "preview-of-values_other": ""
+      "preview-of-values": "數值預覽",
+      "show-more": "顯示更多"
     },
     "version-history": {
       "comparison": {