This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 4f95dd98 Add the query button on Alerting page (#501)
4f95dd98 is described below
commit 4f95dd98074f7176e474fe2616880f0258105712
Author: Fine0830 <[email protected]>
AuthorDate: Tue Sep 30 10:41:06 2025 +0800
Add the query button on Alerting page (#501)
---
src/views/alarm/Header.vue | 25 +++++++++++++++-------
src/views/components/ConditionTags.vue | 6 +++---
.../trace/components/TraceQuery/TraceContent.vue | 1 +
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/views/alarm/Header.vue b/src/views/alarm/Header.vue
index 0e04431a..f32e4781 100644
--- a/src/views/alarm/Header.vue
+++ b/src/views/alarm/Header.vue
@@ -28,7 +28,7 @@ limitations under the License. -->
</div>
<div class="mr-10 ml-10">
<span class="grey">{{ t("searchKeyword") }}: </span>
- <el-input size="small" v-model="keyword" class="alarm-tool-input"
@change="refreshAlarms({ pageNum: 1 })" />
+ <el-input size="small" v-model="keyword" class="alarm-tool-input" />
</div>
<div>
<span class="sm b grey mr-5">{{ t("timeRange") }}:</span>
@@ -57,7 +57,12 @@ limitations under the License. -->
/>
</div>
</div>
- <ConditionTags :type="'ALARM'" @update="(data) => refreshAlarms({ pageNum:
1, tagsMap: data.tagsMap })" />
+ <div class="flex-h mt-5" style="justify-content: space-between">
+ <ConditionTags :type="'ALARM'" @update="(data) =>
changeTags(data.tagsMap)" />
+ <el-button size="small" type="primary" @click="refreshAlarms({ pageNum:
1 })">
+ {{ t("runQuery") }}
+ </el-button>
+ </div>
</nav>
</template>
<script lang="ts" setup>
@@ -72,7 +77,7 @@ limitations under the License. -->
import timeFormat from "@/utils/timeFormat";
import type { DurationTime, Duration } from "@/types/app";
import { Themes } from "@/constants/data";
- /*global Recordable */
+ /*global Indexable */
const appStore = useAppStoreWithOut();
const alarmStore = useAlarmStore();
const { t } = useI18n();
@@ -83,6 +88,8 @@ limitations under the License. -->
const pageNum = ref<number>(1);
const duration = ref<DurationTime>(getDurationTime());
const durationRow = ref<Duration>(InitializationDurationRow);
+ const tagsMap = ref<{ key: string; value: string }[]>();
+
const total = computed(() =>
alarmStore.alarms.length === pageSize ? pageSize * pageNum.value + 1 :
pageSize * pageNum.value,
);
@@ -92,14 +99,14 @@ limitations under the License. -->
refreshAlarms({ pageNum: 1 });
- async function refreshAlarms(param: { pageNum: number; tagsMap?: Recordable
}) {
- const params: Recordable = {
+ async function refreshAlarms(param: { pageNum: number }) {
+ const params: Indexable = {
duration: duration.value,
paging: {
pageNum: param.pageNum,
pageSize,
},
- tags: param.tagsMap,
+ tags: tagsMap.value,
};
params.scope = entity.value || undefined;
params.keyword = keyword.value || undefined;
@@ -114,12 +121,10 @@ limitations under the License. -->
durationRow.value = timeFormat(val);
setDurationRow(durationRow.value);
duration.value = getDurationTime();
- refreshAlarms({ pageNum: 1 });
}
function changeEntity(param: { value: string }[]) {
entity.value = param[0].value;
- refreshAlarms({ pageNum: 1 });
}
function changePage(p: number) {
@@ -127,6 +132,10 @@ limitations under the License. -->
refreshAlarms({ pageNum: p });
}
+ function changeTags(tags?: { key: string; value: string }[]) {
+ tagsMap.value = tags || undefined;
+ }
+
watch(
() => appStore.coldStageMode,
() => {
diff --git a/src/views/components/ConditionTags.vue
b/src/views/components/ConditionTags.vue
index ce3df9d3..e47a5a86 100644
--- a/src/views/components/ConditionTags.vue
+++ b/src/views/components/ConditionTags.vue
@@ -64,7 +64,7 @@ limitations under the License. -->
import { ElMessage } from "element-plus";
import { useAppStoreWithOut } from "@/store/modules/app";
- /*global defineEmits, defineProps, Recordable */
+ /*global defineEmits, defineProps, Indexable */
const emit = defineEmits(["update"]);
const props = defineProps({
type: { type: String, default: "TRACE" },
@@ -112,7 +112,7 @@ limitations under the License. -->
emit("update", { tagsMap, tagsList: tagsList.value });
}
async function fetchTagKeys() {
- let resp: Recordable = {};
+ let resp: Indexable = {};
if (props.type === "TRACE") {
resp = await traceStore.getTagKeys();
}
@@ -139,7 +139,7 @@ limitations under the License. -->
async function fetchTagValues() {
const param = tags.value.split("=")[0];
- let resp: Recordable = {};
+ let resp: Indexable = {};
if (props.type === "TRACE") {
resp = await traceStore.getTagValues(param);
}
diff --git
a/src/views/dashboard/related/trace/components/TraceQuery/TraceContent.vue
b/src/views/dashboard/related/trace/components/TraceQuery/TraceContent.vue
index 593a9b99..55db11d7 100644
--- a/src/views/dashboard/related/trace/components/TraceQuery/TraceContent.vue
+++ b/src/views/dashboard/related/trace/components/TraceQuery/TraceContent.vue
@@ -148,6 +148,7 @@ limitations under the License. -->
const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
const baseFilename = `trace-${trace.traceId}-${timestamp}`;
const spans = trace.spans.map((span) => {
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
const { duration, label, ...newSpan } = span;
return newSpan;
});
