Merge branch 'v3' into PMM-13166_nodes_monitor_db

percona · Sep 30, 2024 · 4bd8d20 · 4bd8d20
2 parents 09097c3 + 89a0db3
commit 4bd8d20
Show file tree

Hide file tree

Showing 32 changed files with 53 additions and 42 deletions.
diff --git a/...schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts b/...schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   limit: number;

diff --git a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
   /**

diff --git a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;

diff --git a/...grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts b/...grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export enum VizDisplayMode {
   Candles = 'candles',

diff --git a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export enum HorizontalConstraint {
   Center = 'center',

diff --git a/...grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts b/...grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface MetricStat {
   /**

diff --git a/...ana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts b/...ana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   /**

diff --git a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   selectedSeries: number;

diff --git a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export type UpdateConfig = {
   render: boolean,

diff --git a/...a-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts b/...a-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
 

diff --git a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.SingleStatBaseOptions {
   minVizHeight: number;

diff --git a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   basemap: ui.MapLayerOptions;

diff --git a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 /**
  * Controls the color mode of the heatmap

diff --git a/...ges/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts b/...ges/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**

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
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;

diff --git a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export enum QueryEditorMode {
   Builder = 'builder',

diff --git a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   /**

diff --git a/...ges/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts b/...ges/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface ArcOption {
   /**

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
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 /**
  * Select the pie chart display style.

diff --git a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;

diff --git a/...ana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts b/...ana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**

diff --git a/...ana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts b/...ana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**

diff --git a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options {
   /**

diff --git a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export enum TextMode {
   Code = 'code',

diff --git a/...s/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts b/...s/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;

diff --git a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 /**
  * Identical to timeseries... except it does not have timezone settings

diff --git a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "";
+export const pluginVersion = "11.1.5";
 
 /**
  * Auto is "table" in the UI

diff --git a/...c/app/percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.types.ts b/...c/app/percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.types.ts
@@ -35,23 +35,23 @@ export interface TemplatesList extends Omit<TemplatesListAPI, 'templates'> {
 }
 
 export enum SourceDescription {
-  BUILT_IN = 'BUILT_IN',
-  SAAS = 'SAAS',
-  USER_FILE = 'USER_FILE',
-  USER_API = 'USER_API',
+  BUILT_IN = 'TEMPLATE_SOURCE_BUILT_IN',
+  SAAS = 'TEMPLATE_SOURCE_SAAS',
+  USER_FILE = 'TEMPLATE_SOURCE_USER_FILE',
+  USER_API = 'TEMPLATE_SOURCE_USER_API',
 }
 
-// https://github.com/percona-platform/saas/blob/main/pkg/alert/type.go
+// https://github.com/percona/saas/blob/main/pkg/alert/type.go
 export enum TemplateParamType {
-  FLOAT = 'FLOAT',
-  BOOL = 'BOOL',
-  STRING = 'STRING',
+  FLOAT = 'PARAM_TYPE_FLOAT',
+  BOOL = 'PARAM_TYPE_BOOL',
+  STRING = 'PARAM_TYPE_STRING',
 }
 
-// https://github.com/percona-platform/saas/blob/main/pkg/alert/unit.go
+// https://github.com/percona/saas/blob/main/pkg/alert/unit.go
 export enum TemplateParamUnit {
-  PERCENTAGE = 'PERCENTAGE',
-  SECONDS = 'SECONDS',
+  PERCENTAGE = 'PARAM_UNIT_PERCENTAGE',
+  SECONDS = 'PARAM_UNIT_SECONDS',
 }
 
 export interface TemplateFloatParamAPI {

diff --git a/.../percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.utils.test.ts b/.../percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.utils.test.ts
@@ -50,7 +50,7 @@ describe('AlertRuleTemplatesTable utils', () => {
   });
 
   test('formatSource', () => {
-    expect(formatSource(SourceDescription.BUILT_IN)).toBe(SOURCE_MAP.BUILT_IN);
-    expect(formatSource(SourceDescription.SAAS)).toBe(SOURCE_MAP.SAAS);
+    expect(formatSource(SourceDescription.BUILT_IN)).toBe(SOURCE_MAP.TEMPLATE_SOURCE_BUILT_IN);
+    expect(formatSource(SourceDescription.SAAS)).toBe(SOURCE_MAP.TEMPLATE_SOURCE_SAAS);
   });
 });
diff --git a/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.constants.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.constants.ts
@@ -1,6 +1,8 @@
 import { SelectableValue } from '@grafana/data';
 import { Severity } from 'app/percona/shared/core';
 
+import { TemplateParamType } from '../AlertRuleTemplate/AlertRuleTemplate.types';
+
 // TODO: generate SEVERITY_OPTIONS from its type definitions
 export const SEVERITY_OPTIONS: Array<SelectableValue<keyof typeof Severity>> = [
   {
@@ -40,3 +42,9 @@ export const SEVERITY_OPTIONS: Array<SelectableValue<keyof typeof Severity>> = [
 // We define our default evaluation interval as 60s
 // 'for' can't be less than that, hence this minimum
 export const MINIMUM_DURATION_VALUE = 60;
+
+export const TYPE_TO_KEY_MAP: Record<TemplateParamType, 'bool' | 'float' | 'string'> = {
+  PARAM_TYPE_BOOL: 'bool',
+  PARAM_TYPE_FLOAT: 'float',
+  PARAM_TYPE_STRING: 'string',
+};
diff --git a/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.utils.ts b/public/app/percona/integrated-alerting/components/TemplateForm/TemplateForm.utils.ts
@@ -4,6 +4,8 @@ import { AlertRuleCreatePayload, AlertRulesListResponseChannel, Severity } from
 
 import { TemplatedAlertFormValues } from '../../types';
 
+import { TYPE_TO_KEY_MAP } from './TemplateForm.constants';
+
 export const formatChannelsOptions = (channels: string[]): Array<SelectableValue<string>> =>
   channels
     ? channels.map((channel) => ({
@@ -48,7 +50,7 @@ export const formatCreateAPIPayload = (data: TemplatedAlertFormValues): AlertRul
       payload.params?.push({
         name,
         type,
-        [type.toLowerCase()]: value,
+        [TYPE_TO_KEY_MAP[type]]: value,
       });
     }
   });

diff --git a/public/app/percona/shared/core/types.ts b/public/app/percona/shared/core/types.ts
@@ -95,6 +95,7 @@ export enum Severity {
 import {
   TemplateAnnotation,
   TemplateParam,
+  TemplateParamType,
 } from 'app/percona/integrated-alerting/components/AlertRuleTemplate/AlertRuleTemplate.types';
 
 export enum AlertRuleParamType {
@@ -159,7 +160,7 @@ export interface AlertRulesListPayloadFilter {
 
 export interface AlertRulesListResponseParam {
   name: string;
-  type: keyof typeof AlertRuleParamType;
+  type: TemplateParamType;
   [AlertRuleParamType.BOOL]?: boolean;
   [AlertRuleParamType.FLOAT]?: number;
   [AlertRuleParamType.STRING]?: string;