+
-
+
@@ -100,6 +99,7 @@ along with this program. If not, see
+
.
/>
+
-
-
-
+
-
+
+
-
+
-
+
+
+
+
-
@@ -116,10 +116,10 @@ along with this program. If not, see
+
{{ t("alerts.destination") + " *" }}
@@ -213,7 +213,7 @@ along with this program. If not, see
+
+
Trigger if the value is
@@ -78,7 +78,7 @@ along with this program. If not, see
Aggregation
@@ -95,11 +95,11 @@ along with this program. If not, see
{{ t("alerts.groupBy") }}
@@ -122,7 +122,7 @@ along with this program. If not, see
{{ t("alerts.threshold") + " *" }}
@@ -206,10 +207,12 @@ along with this program. If not, see
-
-
+
+
+
+
+
-
.
- Field is required!
-
+
@@ -382,7 +379,7 @@ along with this program. If not, see
{{ t("alerts.period") + " *" }}
@@ -408,7 +405,7 @@ along with this program. If not, see
-
+
.
-
{{ t("alerts.crontitle") + " *" }}
-
+
.
>
+
{{ t("alerts.frequency") + " *" }}
-
+
.
? 'width: 87px; margin-left: 0 !important'
: 'width: fit-content !important'
"
- class=""
>
-
+
@@ -711,7 +710,7 @@ along with this program. If not, see
-
+
-
.
+
{{ t("alerts.destination") + " *" }}
@@ -791,6 +790,7 @@ along with this program. If not, see
-
+
+
@@ -889,10 +889,11 @@ along with this program. If not, see
Cycle
-
Compare results with the same time in the previous cycle.
-
+
+
@@ -913,7 +914,7 @@ along with this program. If not, see
+
Comparing with
@@ -921,7 +922,7 @@ along with this program. If not, see
+ class="tw-flex tw-flex-col lg:tw-flex-row tw-justify-between tw-items-start reference-window-container tw-mt-2 q-px-md q-py-sm ">
Time range for your query.
+
Reference Window {{ index + 1 }}
@@ -929,10 +930,11 @@ along with this program. If not, see
Cycle
-
+
+
Compare results with the same time in the previous cycle.
+
@@ -1000,7 +1003,7 @@ along with this program. If not, see
+
-
+ .
-
+
@@ -1080,7 +1083,7 @@ along with this program. If not, see
Editor
- SQL and VRL Functions
+ Create SQL and VRL triggers with specific conditions.
+
-
-
-
+
-
-
+
+ Add Conditions
@@ -1154,22 +1170,42 @@ along with this program. If not, see
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
{{ tab === 'sql' ? 'SQL Editor' : 'PromQL Editor' }}
+
+
-
+
-
-
+
+
+
{{ t("search.noResult") }}
-
+
+
+ ![]()
+ Generate SQL
+
+
+
+ on {{ alertData.stream_name }} stream
+
+
+ No Stream Selected
+
+
-
-
+
+
+
+
-
-
+
+
VRL Editor
-
+
-
-
+
-
+ v-model="selectedFunction"
+ :options="functionOptions"
+ data-test="dashboard-use-saved-vrl-function"
+ input-debounce="0"
+ behavior="menu"
+ use-input
+ filled
+ borderless
+ dense
+ hide-selected
+ menu-anchor="bottom left"
+ fill-input
+ option-label="name"
+ option-value="name"
+ @filter="filterFunctionOptions"
+ @update:modelValue="onFunctionSelect"
+ class="mini-select"
+ clearable
+ @clear="onFunctionClear"
+ style="width: 150px;"
+ placeholder="Saved functions"
+ input-style="height: 12px; min-height: 8px; margin: 0px; width: 120px; "
+ >
+
{{ t("search.noResult") }}
@@ -1297,22 +1374,33 @@ along with this program. If not, see
-
+
+ ![]()
+ Generate VRL
+
+
+
-
-
- {{ tab === 'sql' ? 'SQL' : 'PromQL' }} Output
-
+
+
+ (null);
+const runFnQueryLoading = ref(false);
+
const selectedColumn = ref({
label: "",
value: ""
@@ -2207,9 +2286,12 @@ const routeToCreateDestination = () => {
if(selectedColumn.value.value){
query.value += ` ${selectedColumn.value.value} `
}
- selectedColumn.value = ""
+ // selectedColumn.value = {
+ // label: "",
+ // value: ""
+ // }
};
- const buildMulitWindowQuery = (sql: any, fn: boolean = false) => {
+ const buildMulitWindowQuery = (sql: any, fn: boolean = false, periodInMicroseconds: number) => {
const queryToSend: any = [
];
@@ -2237,8 +2319,8 @@ const routeToCreateDestination = () => {
const endTime = now;
const startTime = endTime - offsetMicroseconds;
- individualQuery.start_time = startTime;
- individualQuery.end_time = endTime;
+ individualQuery.start_time = startTime - periodInMicroseconds;
+ individualQuery.end_time = startTime;
individualQuery.sql = sql;
individualQuery.query_fn = fn ? b64EncodeUnicode(vrlFunctionContent.value) : null;
queryToSend.push(individualQuery);
@@ -2251,6 +2333,11 @@ const routeToCreateDestination = () => {
};
const triggerQuery = async (fn: boolean = false) => {
+ const isAllColumnsSelected = await checkIfAllColumnsAreSelected(query.value);
+ if(!isAllColumnsSelected){
+ return;
+ }
+ try{
const queryReq = buildQueryPayload({
sqlMode: true,
streamName: selectedStream.value,
@@ -2261,44 +2348,48 @@ const routeToCreateDestination = () => {
const endTime = new Date().getTime() * 1000; // ← Use 1000 to get microseconds
const startTime = endTime - periodInMicroseconds;
queryReq.query.query_fn = null;
-
- if(selectedMultiWindowOffset.value.length == 0){
- queryReq.query.start_time = startTime;
- queryReq.query.end_time = endTime;
- runQueryLoading.value = true;
- if(fn){
- queryReq.query.query_fn = b64EncodeUnicode(vrlFunctionContent.value);
- outputFnEvents.value = "";
- }
- else{
- outputEvents.value = "";
- }
- if(queryReq.aggs){
- delete queryReq.aggs;
- }
- try {
- const res = await searchService.search({
- org_identifier: store.state.selectedOrganization.identifier,
- query: queryReq,
- page_type: selectedStreamType.value,
- })
- if(res.data.hits.length > 0){
- if(fn){
- outputFnEvents.value = JSON.stringify(res.data.hits,null,2);
- }
- else{
- outputEvents.value = JSON.stringify(res.data.hits,null,2);
- }
- }
- runQueryLoading.value = false;
- } catch (err) {
- console.log(err,"err")
- runQueryLoading.value = false;
- }
- }
- else{
+ // //this is for single window query but we will deprecate this in future
+ //as we show any ways array in array so we will call multi search call always
+ // if(selectedMultiWindowOffset.value.length == 0){
+ // queryReq.query.start_time = startTime;
+ // queryReq.query.end_time = endTime;
+ // runQueryLoading.value = true;
+ // if(fn){
+ // queryReq.query.query_fn = b64EncodeUnicode(vrlFunctionContent.value);
+ // outputFnEvents.value = "";
+ // }
+ // else{
+ // outputEvents.value = "";
+ // }
+ // if(queryReq.aggs){
+ // delete queryReq.aggs;
+ // }
+ // try {
+ // const res = await searchService.search({
+ // org_identifier: store.state.selectedOrganization.identifier,
+ // query: queryReq,
+ // page_type: selectedStreamType.value,
+ // })
+ // if(res.data.hits.length > 0){
+ // if(fn){
+ // outputFnEvents.value = JSON.stringify(res.data.hits,null,2);
+ // }
+ // else{
+ // outputEvents.value = JSON.stringify(res.data.hits,null,2);
+ // }
+ // }
+ // runQueryLoading.value = false;
+ // } catch (err) {
+ // console.log(err,"err")
+ // runQueryLoading.value = false;
+ // }
+ // }
queryReq.query.sql_mode = true;
queryReq.query.per_query_response = true;
+ //initial query to send like with period for suppose we have 10minutes of period then we will send 10 minutes of data
+ //so we will send 10 minutes of data in initial query
+ //and then if any multi window offset is selected then we will call buildMulitWindowQuery function to get the query to send
+ //and then we will push the query to send to the queryReq.query.sql
let queryTosend = [
{
start_time: startTime,
@@ -2307,7 +2398,7 @@ const routeToCreateDestination = () => {
query_fn: fn ? b64EncodeUnicode(vrlFunctionContent.value) : null
}
];
- queryTosend.push(...buildMulitWindowQuery(queryReq.query.sql, fn));
+ queryTosend.push(...buildMulitWindowQuery(queryReq.query.sql, fn,periodInMicroseconds));
queryReq.query.sql = queryTosend;
const res = await searchService.search({
org_identifier: store.state.selectedOrganization.identifier,
@@ -2323,6 +2414,13 @@ const routeToCreateDestination = () => {
}
}
}
+ catch(err){
+ q.notify({
+ type: "negative",
+ message:err.response.data.message ?? "Error while fetching results",
+ timeout: 1500,
+ });
+ }
}
@@ -2330,20 +2428,33 @@ const routeToCreateDestination = () => {
const runSqlQuery = async () => {
runPromqlError.value = "";
tempRunQuery.value = true;
- expandCombinedOutput.value = false;
expandSqlOutput.value = true;
- await triggerQuery();
+ try{
+ runQueryLoading.value = true;
+ await triggerQuery();
+ runQueryLoading.value = false;
+ }
+ catch(err){
+ runQueryLoading.value = false;
+ }
};
const runTestFunction = async () => {
runPromqlError.value = "";
tempTestFunction.value = true;
expandCombinedOutput.value = true;
- expandSqlOutput.value = false;
- await triggerQuery(true);
+ runFnQueryLoading.value = true;
+ try{
+ await triggerQuery(true);
+ runFnQueryLoading.value = false;
+ }
+ catch(err){
+ runFnQueryLoading.value = false;
+ }
}
+
// Method to handle the emitted changes and update the structure
function updateGroup(updatedGroup:any) {
emits('update:group', updatedGroup)
@@ -2384,7 +2495,6 @@ const routeToCreateDestination = () => {
const runPromqlQuery = async () => {
runPromqlError.value = "";
tempRunQuery.value = true;
- expandCombinedOutput.value = false;
expandSqlOutput.value = true;
await triggerPromqlQuery();
}
@@ -2401,7 +2511,6 @@ const routeToCreateDestination = () => {
queryReq.query.start_time = startTime;
queryReq.query.end_time = endTime;
- runQueryLoading.value = true;
outputEvents.value = "";
try {
const res = await searchService.metrics_query_range({
@@ -2414,10 +2523,8 @@ const routeToCreateDestination = () => {
if(res.data.hits.length > 0){
outputEvents.value = JSON.stringify(res.data.hits,null,2);
}
- runQueryLoading.value = false;
} catch (err: any) {
runPromqlError.value = err.response.data.error ?? "Something went wrong";
- runQueryLoading.value = false;
}
}
@@ -2428,16 +2535,18 @@ const routeToCreateDestination = () => {
}
+ const getBtnO2Logo = computed(() => {
+ return getImageURL('images/common/ai_icon_blue.svg')
+ })
const getBtnLogo = computed(() => {
- if (isHovered.value || store.state.isAiChatEnabled) {
- return getImageURL('images/common/ai_icon_dark.svg')
- }
-
- return store.state.theme === 'dark'
- ? getImageURL('images/common/ai_icon_dark.svg')
- : getImageURL('images/common/ai_icon.svg')
- })
+ if (isHovered.value || store.state.isAiChatEnabled) {
+ return getImageURL('images/common/ai_icon_dark.svg')
+ }
+ return store.state.theme === 'dark'
+ ? getImageURL('images/common/ai_icon_dark.svg')
+ : getImageURL('images/common/ai_icon.svg')
+ })
const convertMinutesToDisplayValue = (value: number) => {
if (!value || value < 0) return '0 minutes';
@@ -2520,6 +2629,29 @@ const routeToCreateDestination = () => {
});
};
+ const checkIfAllColumnsAreSelected = async (query: string) => {
+ const parser = await sqlParser();
+ const regex = /\bdefault\b/g;
+ const columns = parser.astify(
+ query.replace(regex, "default1"),
+ ).columns;
+ for (const column of columns) {
+ if (column.expr.column === "*") {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ const isHavingError = computed(() => {
+ return (
+ !aggregationData.value.function ||
+ !aggregationData.value.having.column ||
+ !aggregationData.value.having.operator ||
+ !aggregationData.value.having.value?.toString().trim().length
+ );
+ });
+
defineExpose({
tab,
@@ -2554,7 +2686,10 @@ defineExpose({
scheduledAlertRef,
filterDestinations,
filteredDestinations,
- destinationSelectRef
+ destinationSelectRef,
+ getBtnO2Logo,
+ runFnQueryLoading,
+ isHavingError
});
@@ -2777,21 +2912,25 @@ defineExpose({
.dark-mode .editor-text-title{
font-size: 16px;
- font-weight: 600;
+ font-weight: bold;
color: #FFFFFF;
}
.light-mode .editor-text-title{
font-size: 16px;
- font-weight: 600;
- color: #3d3d3d;
+ font-weight: bold;
+ color: #6b7280;
}
.dark-mode .mini-select .q-field__control {
background-color: #181a1b !important;
+ border: 1px solid #7c7b7b !important;
+ border-radius: 4px !important;
}
+
.light-mode .mini-select .q-field__control {
background-color: #ffffff !important;
border: 1px solid #e0e0e0 !important;
+ border-radius: 4px !important;
}
.dark-mode .sql-output-section{
@@ -2813,7 +2952,7 @@ defineExpose({
font-size: 16px;
}
.light-mode .no-output-before-run-query{
- background-color: #e1e1e1;
+ background-color: #fafafa;
border: 1px solid #e9e9e9;
min-height: 10rem;
color: #a7abaa;
@@ -2855,7 +2994,12 @@ defineExpose({
.light-mode-editor {
border: 1px solid #e0e0e0 !important;
}
-
-
-
+.o2-select-input {
+ .q-field{
+ .q-field__control{
+ min-height: 32px !important;
+ max-height: 32px !important;
+ }
+ }
+}
diff --git a/web/src/components/alerts/VariablesInput.vue b/web/src/components/alerts/VariablesInput.vue
index 0cfd6d56cc..c4ad0a4d05 100644
--- a/web/src/components/alerts/VariablesInput.vue
+++ b/web/src/components/alerts/VariablesInput.vue
@@ -17,10 +17,13 @@ along with this program. If not, see
+
-
+
+
+
-
-
+ Results include all multi-window additions
+
+
+
-
-
-
-
-
-
-
- {{triggerData.period }} minute(s) ago
-
-
-
-
- {{getDisplayValue(picker.offSet)}}ago
-
-
-
-
-
@@ -1545,6 +1616,10 @@ import { pick } from "lodash-es";
import config from "@/aws-exports";
import O2AIChat from "../O2AIChat.vue";
+import FullViewContainer from "@/components/functions/FullViewContainer.vue";
+
+import useParser from "@/composables/useParser";
+
const QueryEditor = defineAsyncComponent(
() => import("@/components/CodeQueryEditor.vue"),
);
@@ -1627,6 +1702,8 @@ const queryEditorPlaceholderFlag = ref(true);
const isFunctionErrorExpanded = ref(false);
+const { sqlParser } = useParser();
+
const tempTestFunction = ref(false);
const metricFunctions = ["p50", "p75", "p90", "p95", "p99"];
const regularFunctions = ["avg", "max", "min", "sum", "count"];
@@ -1661,7 +1738,7 @@ const viewVrlFunction = ref(false);
const expandSqlOutput = ref(true);
-const expandCombinedOutput = ref(false);
+const expandCombinedOutput = ref(true);
const filteredDestinations = ref(props.formattedDestinations)
@@ -1681,6 +1758,8 @@ const runPromqlError = ref("");
const scheduledAlertRef = ref
+
+
+
+
+
+
+
+
- Please run the query to see the output
+ Please click Run Query to see the output
+
-
+
-
Fetching Search Results...
-
+
-
-
- Combined Output (SQL and VRL)
-
-
-
-
-
-
-
-
-
- {{triggerData.period }} minute(s) ago
-
-
-
-
- {{getDisplayValue(picker.offSet)}}ago
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+ SQL + VRL
+
+
+
+
- Please test the function to see the output
+ Please click Apply VRL to see the combined output
+
-
+
Fetching Search Results...
-
+
-
+
+
+
-
Variable
+
+
+ Variable
+
-
+