Merge branch 'main' of github.com:apache/skywalking-booster-ui into feat/metric-trace

This commit is contained in:
Fine 2022-10-18 10:04:37 +08:00
commit 2fc55e3d97
7 changed files with 33 additions and 0 deletions

View File

@ -21,6 +21,7 @@ export enum MetricQueryTypes {
ReadLabeledMetricsValues = "readLabeledMetricsValues",
READHEATMAP = "readHeatMap",
ReadSampledRecords = "readSampledRecords",
ReadRecords = "readRecords",
}
export enum Calculations {
@ -101,4 +102,10 @@ export const RespFields: any = {
value
refId
}`,
readRecords: `{
id
name
value
refId
}`,
};

View File

@ -73,6 +73,22 @@ export function useQueryProcessor(config: any) {
topN: c.topN || 10,
order: c.sortOrder || "DES",
};
} else if ([MetricQueryTypes.ReadRecords].includes(metricType)) {
variables.push(`$condition${index}: RecordCondition!`);
conditions[`condition${index}`] = {
name,
parentEntity: {
scope: config.catalog,
normal: selectorStore.currentService
? selectorStore.currentService.normal
: true,
serviceName: ["All"].includes(dashboardStore.entity)
? null
: selectorStore.currentService.value,
},
topN: c.topN || 10,
order: c.sortOrder || "DES",
};
} else {
if (metricType === MetricQueryTypes.ReadLabeledMetricsValues) {
const labels = (c.labelsIndex || "")
@ -435,6 +451,7 @@ export async function useGetMetricEntity(metric: string, metricType: any) {
[
MetricQueryTypes.ReadSampledRecords,
MetricQueryTypes.SortMetrics,
MetricQueryTypes.ReadRecords,
].includes(metricType)
) {
const res = await dashboardStore.fetchMetricList(metric);

View File

@ -108,6 +108,7 @@ const msg = {
showXAxis: "Show X Axis",
showYAxis: "Show Y Axis",
nameError: "The dashboard name cannot be duplicate",
nameEmptyError: "The dashboard name cannot be empty",
showGroup: "Show Group",
noRoot: "Please set a root dashboard for",
noWidget: "Please add widgets.",

View File

@ -110,6 +110,7 @@ const msg = {
showXAxis: "Mostrar Eje X",
showYAxis: "Mostrar Eje Y",
nameError: "El nombre del panel no puede ser duplicado",
nameEmptyError: "El nombre del panel no puede estar vacío",
showGroup: "Mostrar Grupo",
noRoot: "Por favor ponga la raíz del panel",
noWidget: "Por favor añada widgets.",

View File

@ -106,6 +106,7 @@ const msg = {
showXAxis: "显示X轴",
showYAxis: "显示Y轴",
nameError: "仪表板名称不能重复",
nameEmptyError: "仪表板名称不能为空",
noRoot: "请设置根仪表板,为",
showGroup: "显示分组",
noWidget: "请添加组件",

View File

@ -81,6 +81,10 @@ const onCreate = () => {
states.entity === d.entity &&
states.selectedLayer === d.layer
);
if (!states.name) {
ElMessage.error(t("nameEmptyError"));
return;
}
if (index > -1) {
ElMessage.error(t("nameError"));
return;

View File

@ -45,6 +45,7 @@ export const MetricChartType: any = {
readLabeledMetricsValues: [{ label: "Line", value: "Line" }],
readHeatMap: [{ label: "Heat Map", value: "HeatMap" }],
readSampledRecords: [{ label: "Top List", value: "TopList" }],
readRecords: [{ label: "Top List", value: "TopList" }],
};
export const DefaultGraphConfig: { [key: string]: any } = {
Bar: {
@ -134,6 +135,7 @@ export const MetricTypes: {
{ label: "read heatmap values in the duration", value: "readHeatMap" },
],
SAMPLED_RECORD: [
{ label: "get sorted topN values", value: "readRecords" },
{ label: "get sorted topN values", value: "readSampledRecords" },
],
};