Alert Prerequisites (#266)

* Alerting Support

* problemi

* alert prereq

* working

* other fixes

* ready

Author: Mattia Moretti

src/QueryEditor.tsx

@@ -38,23 +38,23 @@ export const QueryEditor: React.FC<Props> = (props) => {
     { label: 'Builder', value: true },
   ];  
 
-
   const onApplyQueryChange = (changedQuery: OCIQuery, runQuery = true) => {
     if (runQuery) {        
       const queryModel = new QueryModel(changedQuery, getTemplateSrv());
+
       // for metrics
-      if (datasource.isVariable(String(query.metric))) {
-        let { [String(query.metric)]: var_metric } = datasource.interpolateProps({ [String(query.metric)]: query.metric });
+      if (datasource.isVariable(String(changedQuery.metric))) {
+        let { [String(changedQuery.metric)]: var_metric } = datasource.interpolateProps({ [String(changedQuery.metric)]: changedQuery.metric });
         if (var_metric !== "" && var_metric !== QueryPlaceholder.Metric) { 
-          query.metric = var_metric
+          changedQuery.metric = var_metric
         }
       }
       if (queryModel.isQueryReady()) {
-
-        if (query.rawQuery === false){
-          changedQuery.queryText = queryModel.buildQuery(String(query.queryTextRaw));
+  
+        if (changedQuery.rawQuery === false){
+          changedQuery.queryText = queryModel.buildQuery(String(changedQuery.queryTextRaw));
         } else {
-          changedQuery.queryText = queryModel.buildQuery(String(query.metric));
+          changedQuery.queryText = queryModel.buildQuery(String(changedQuery.metric));
         }
 
         onChange({ ...changedQuery });
@@ -65,6 +65,7 @@ export const QueryEditor: React.FC<Props> = (props) => {
     }
   };
 
+
   const init = () => {
     let initialDimensions: any = [];
     let initialTags: any = [];
@@ -419,8 +420,8 @@ export const QueryEditor: React.FC<Props> = (props) => {
 
 
   const onMetricChange = (data: any) => {
-    setMetricValue(data);     
-    onApplyQueryChange({ ...query, metric: data.value });
+    setMetricValue(data);
+    onApplyQueryChange({ ...query, metric: data.value }, true);
   };
   const onAggregationChange = (data: any) => {
     onApplyQueryChange({ ...query, statisticLabel: data.label, statistic: data.value });

src/datasource.ts

@@ -26,6 +26,7 @@ import {
   tenanciesQueryRegex,
   DEFAULT_TENANCY,
   compartmentsQueryRegex,
+  SetAutoInterval,
 } from "./types";
 import QueryModel from './query_model';
 
@@ -51,20 +52,6 @@ export class OCIDataSource extends DataSourceWithBackend<OCIQuery, OCIDataSource
     return true;
   }
 
-  SetAutoInterval(timestamp1: number, timestamp2: number): string {
-    const differenceInMs = timestamp2 - timestamp1;
-    const differenceInHours = differenceInMs / (1000 * 60 * 60);
-  
-    // use limits and defaults specified here: https://docs.oracle.com/en-us/iaas/Content/Monitoring/Reference/mql.htm#Interval
-    if (differenceInHours <= 6) {
-      return "[1m]"; // Equal or Less than 6 hours, set to 1 minute interval
-    } else if (differenceInHours < 36) {
-      return "[5m]"; // Between 6 and 36 hours, set to 5 minute interval
-    } else {
-      return "[1h]"; // More than 36 hours, set to 1 hour interval
-    }
-  }
-
   compartmentFormatter = (value: string): string => {
     // if (typeof value === 'string') {
     //   return value;
@@ -91,7 +78,7 @@ export class OCIDataSource extends DataSourceWithBackend<OCIQuery, OCIDataSource
       query.interval = templateSrv.replace(query.interval, scopedVars);
     }
     if (query.interval === QueryPlaceholder.Interval || query.interval === "auto" || query.interval === undefined){
-      query.interval = this.SetAutoInterval(TimeStart, TimeEnd);
+      query.interval = SetAutoInterval(TimeStart, TimeEnd);
     }
     query.region = templateSrv.replace(query.region, scopedVars);
     query.tenancy = templateSrv.replace(query.tenancy, scopedVars);

src/query_model.ts

@@ -3,9 +3,9 @@
 ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 
-import { OCIQuery, QueryPlaceholder, AggregationOptions } from './types';
+import { OCIQuery, QueryPlaceholder, AggregationOptions, SetAutoInterval } from './types';
 import { ScopedVars } from '@grafana/data';
-import { TemplateSrv } from '@grafana/runtime';
+import { TemplateSrv, getTemplateSrv } from '@grafana/runtime';
 
 export default class QueryModel {
   target: OCIQuery;
@@ -47,7 +47,7 @@ export default class QueryModel {
       this.target.queryText =
         incomingQuery.queryTextRaw || 'metric[interval]{dimensionname="dimensionvalue"}.groupingfunction.statistic';
     } else {
-      this.target.queryText = incomingQuery.queryText || this.buildQuery(String(this.target.metric));
+      this.target.queryText = this.buildQuery(String(this.target.metric));
     }
   }
 
@@ -57,7 +57,7 @@ export default class QueryModel {
       this.target.tenancy === QueryPlaceholder.Tenancy ||
       this.target.region === QueryPlaceholder.Region ||
       this.target.namespace === QueryPlaceholder.Namespace ||
-      (this.target.metric === QueryPlaceholder.Metric && this.target.queryTextRaw === '')
+      ((this.target.metric === QueryPlaceholder.Metric || this.target.metric === undefined) && this.target.queryTextRaw === '')
     ) {
       return false;
     }
@@ -72,9 +72,27 @@ export default class QueryModel {
       queryText = String(this.target.queryTextRaw);
     }  else {
       // if builder mode is used then:
-
       // add interval
-      queryText += this.target.interval;
+      let convertedInterval;
+      try {
+        // Check for special cases or undefined interval
+        if (this.target.interval === QueryPlaceholder.Interval || this.target.interval === "auto" || !this.target.interval) {
+          const timeStart = parseInt(getTemplateSrv().replace("${__from}"), 10);
+          const timeEnd = parseInt(getTemplateSrv().replace("${__to}"), 10);
+      
+          if (isNaN(timeStart) || isNaN(timeEnd)) {
+            convertedInterval = "[1m]"; // Default interval if parsing fails
+          } else {
+            convertedInterval = SetAutoInterval(timeStart, timeEnd); // Use custom function
+          }
+        } else {
+          convertedInterval = this.target.interval; // Use existing interval for other cases
+        }
+      } catch (error) {
+        convertedInterval = "[1m]"; // Default interval on error
+      }
+   
+      queryText += convertedInterval;
 
       // add dimensions
       let dimensionParams = '{';

src/types.ts

@@ -173,3 +173,17 @@ export interface OCISecureJsonData {
 	fingerprint5: string;
 	privkey5: string;
 }
+
+export const SetAutoInterval = (timestamp1: number, timestamp2: number): string => {
+  const differenceInMs = timestamp2 - timestamp1;
+  const differenceInHours = differenceInMs / (1000 * 60 * 60);
+
+  // use limits and defaults specified here: https://docs.oracle.com/en-us/iaas/Content/Monitoring/Reference/mql.htm#Interval
+  if (differenceInHours <= 6) {
+    return "[1m]"; // Equal or Less than 6 hours, set to 1 minute interval
+  } else if (differenceInHours < 36) {
+    return "[5m]"; // Between 6 and 36 hours, set to 5 minute interval
+  } else {
+    return "[1h]"; // More than 36 hours, set to 1 hour interval
+  }
+};