diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index d6cde5e5..0510d819 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -162,7 +162,8 @@ const msg = {
viewTrace: "View Related Traces",
relatedTraceOptions: "Related Trace Options",
setLatencyDuration: "Latency Related Metrics",
- queryOrder: "Query Order",
+ queryOrder: "Query By Duration",
+ setOrder: "Query Order",
latency: "Latency",
metricValues: "Metric Values",
queryConditions: "Query Conditions",
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index f1b87697..d8bc29c6 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -159,7 +159,8 @@ const msg = {
postgreSQL: "PostgreSQL",
endpointTips: "Aquí, la tabla muestra hasta 20 punto final.",
apisix: "APISIX",
- queryOrder: "Orden de consulta",
+ queryOrder: "Consulta por duración",
+ setOrder: "Orden de consulta",
latency: "Retraso",
metricValues: "Valor métrico",
legendValues: "Valor de la leyenda",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 9c990b8c..1d1c0301 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -159,7 +159,8 @@ const msg = {
viewTrace: "查看相关Trace",
relatedTraceOptions: "相关的Trace选项",
setLatencyDuration: "延迟相关指标",
- queryOrder: "查询顺序",
+ queryOrder: "按持续时间查询",
+ setOrder: "查询顺序",
latency: "延迟",
metricValues: "指标值",
enableRelatedTrace: "启用相关Trace",
diff --git a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
index ca30da05..7db90f19 100644
--- a/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
+++ b/src/views/dashboard/configuration/widget/RelatedTraceOptions.vue
@@ -46,7 +46,7 @@ limitations under the License. -->
/>
- {{ t("queryOrder") }}
+ {{ t("setOrder") }}
import { ref } from "vue";
import { useI18n } from "vue-i18n";
import { useDashboardStore } from "@/store/modules/dashboard";
-import { Status, QueryOrders, RefIdTypes } from "../../data";
+import { RefIdTypes } from "../../data";
+const QueryOrders = [
+ { label: "None", value: "BY_START_TIME" },
+ { label: "Duration", value: "BY_DURATION" },
+];
+const Status = [
+ { label: "None", value: "ALL" },
+ { label: "Success", value: "SUCCESS" },
+ { label: "Error", value: "ERROR" },
+];
const { t } = useI18n();
const dashboardStore = useDashboardStore();
const { graph, relatedTrace } = dashboardStore.selectedGrid;
diff --git a/src/views/dashboard/configuration/widget/metric/Index.vue b/src/views/dashboard/configuration/widget/metric/Index.vue
index 6c66f056..2d3bc28f 100644
--- a/src/views/dashboard/configuration/widget/metric/Index.vue
+++ b/src/views/dashboard/configuration/widget/metric/Index.vue
@@ -60,7 +60,10 @@ limitations under the License. -->
/>
{
const graph = dashboardStore.selectedGrid.graph || {};
return (
ListChartTypes.includes(graph.type) ||
- ["readLabeledMetricsValues", "readMetricsValues"].includes(metricType.value)
+ [
+ ProtocolTypes.ReadLabeledMetricsValues,
+ ProtocolTypes.ReadMetricsValues,
+ ].includes(metricType.value)
);
});
const isTopn = computed(() =>
- ["sortMetrics", "readSampledRecords"].includes(metricTypes[props.index])
+ [
+ ProtocolTypes.SortMetrics,
+ ProtocolTypes.ReadSampledRecords,
+ ProtocolTypes.ReadRecords,
+ ].includes(metricTypes[props.index])
);
function updateConfig(index: number, param: { [key: string]: string }) {
const key = Object.keys(param)[0];
diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts
index b386e28a..f5a0a05d 100644
--- a/src/views/dashboard/data.ts
+++ b/src/views/dashboard/data.ts
@@ -47,6 +47,15 @@ export const MetricChartType: any = {
readSampledRecords: [{ label: "Top List", value: "TopList" }],
readRecords: [{ label: "Top List", value: "TopList" }],
};
+export enum ProtocolTypes {
+ ReadRecords = "readRecords",
+ ReadSampledRecords = "readSampledRecords",
+ SortMetrics = "sortMetrics",
+ ReadLabeledMetricsValues = "readLabeledMetricsValues",
+ ReadHeatMap = "readHeatMap",
+ ReadMetricsValues = "readMetricsValues",
+ ReadMetricsValue = "readMetricsValue",
+}
export const DefaultGraphConfig: { [key: string]: any } = {
Bar: {
type: "Bar",
diff --git a/src/views/dashboard/related/trace/Header.vue b/src/views/dashboard/related/trace/Header.vue
index 9d03d6c7..2cdd71bf 100644
--- a/src/views/dashboard/related/trace/Header.vue
+++ b/src/views/dashboard/related/trace/Header.vue
@@ -138,8 +138,10 @@ init();
async function init() {
for (const d of Object.keys(filters)) {
if (
- ["queryOrder"].includes(d) ||
- (d === "status" && filters[d] && filters[d] !== "ALL") ||
+ (d === "queryOrder" &&
+ filters[d] &&
+ filters[d] === QueryOrders[1].value) ||
+ (d === "status" && filters[d] && filters[d] !== Status[0].value) ||
(filters[d] && d === "latency")
) {
items.value.push({ label: d, value: FiltersKeys[d] });