Prometheus Mappings Fix

Signed-off-by: Vamsi Manohar <[email protected]>
opensearch-project · Nov 3, 2022 · 5bc2c17 · 5bc2c17
1 parent 001709a
commit 5bc2c17
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 2 deletions.
diff --git a/dashboards-observability/public/plugin.ts b/dashboards-observability/public/plugin.ts
@@ -47,7 +47,7 @@ export class ObservabilityPlugin implements Plugin<ObservabilitySetup, Observabi
         const pplService = new PPLService(coreStart.http);
         const dslService = new DSLService(coreStart.http);
         const savedObjects = new SavedObjects(coreStart.http);
-        const timestampUtils = new TimestampUtils(dslService);
+        const timestampUtils = new TimestampUtils(dslService, pplService);
         const qm = new QueryManager();
         return Observability(
           coreStart,

diff --git a/dashboards-observability/public/services/timestamp/timestamp.ts b/dashboards-observability/public/services/timestamp/timestamp.ts
@@ -6,10 +6,11 @@
 import { isEmpty, isEqual, values, keys } from 'lodash';
 import DSLService from '../requests/dsl';
 import { IDefaultTimestampState } from '../../../common/types/explorer';
+import PPLService from '../requests/ppl';
 
 // eslint-disable-next-line import/no-default-export
 export default class TimestampUtils {
-  constructor(private dslService: DSLService) {}
+  constructor(private dslService: DSLService, private pplService: PPLService) {}
 
   isTimeField(type: string) {
     return ['date', 'date_nanos'].some((dateTimeType) => isEqual(type, dateTimeType));
@@ -60,6 +61,53 @@ export default class TimestampUtils {
   }
 
   async getIndexMappings(index: string) {
+    const myArray = index.split('.');
+    if (myArray.length > 1) {
+      if (await this.isPrometheusCatalog(myArray[0])) {
+        const mappings = await this.pplService.fetch({
+          query: 'describe ' + index + ' | fields COLUMN_NAME, DATA_TYPE',
+          format: 'jdbc',
+        });
+        return this.convertToMappings(index, mappings);
+      }
+    }
     return await this.dslService.fetchFields(index);
   }
+
+  async isPrometheusCatalog(catalog: string) {
+    const catalogs = await this.pplService.fetch({
+      query: "show catalogs | where CONNECTOR_TYPE='PROMETHEUS' | fields CATALOG_NAME",
+      format: 'viz',
+    });
+    if (
+      catalogs.data &&
+      catalogs.data.CATALOG_NAME &&
+      catalogs.data.CATALOG_NAME.includes(catalog)
+    ) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  private convertToMappings(index: string, {datarows}: object) {
+    const result = {};
+    result[index] = {};
+    result[index]["mappings"]={};
+    result[index]["mappings"]["properties"] = {};
+    if(datarows) {
+      for (const s of datarows) {
+        const key = s[0];
+        let datatype = s[1];
+        if(datatype === 'timestamp') {
+          datatype = 'date';
+        }
+        result[index]["mappings"]["properties"][key] = {
+          type : datatype
+        };
+      }
+    }
+    console.log(result);
+    return result;
+  }
 }