[Rename] telemetry and visualizations inconsistencies (#164)

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
opensearch-project · Mar 20, 2021 · d124248 · d124248
1 parent 0c4b181
commit d124248
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -2385,7 +2385,7 @@
       "properties": {
         "ece": {
           "properties": {
-            "opensearch_dashboards_uuid": {
+            "osd_uuid": {
               "type": "keyword"
             },
             "opensearch_uuid": {
@@ -2426,7 +2426,7 @@
         },
         "ess": {
           "properties": {
-            "opensearch_dashboards_uuid": {
+            "osd_uuid": {
               "type": "keyword"
             },
             "opensearch_uuid": {

diff --git a/src/plugins/telemetry/server/collectors/usage/schema.ts b/src/plugins/telemetry/server/collectors/usage/schema.ts
@@ -33,13 +33,13 @@ const licenseSchema: MakeSchemaFrom<LicenseUsage> = {
 
 export const staticTelemetrySchema: MakeSchemaFrom<StaticTelemetryUsage> = {
   ece: {
-    opensearch_dashboards_uuid: { type: 'keyword' },
+    osd_uuid: { type: 'keyword' },
     opensearch_uuid: { type: 'keyword' },
     account_id: { type: 'keyword' },
     license: licenseSchema,
   },
   ess: {
-    opensearch_dashboards_uuid: { type: 'keyword' },
+    osd_uuid: { type: 'keyword' },
     opensearch_uuid: { type: 'keyword' },
     account_id: { type: 'keyword' },
     license: licenseSchema,

diff --git a/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts b/src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts
@@ -95,13 +95,13 @@ export interface LicenseUsage {
 
 export interface StaticTelemetryUsage {
   ece?: {
-    opensearch_dashboards_uuid: string;
+    osd_uuid: string;
     opensearch_uuid: string;
     account_id: string;
     license: LicenseUsage;
   };
   ess?: {
-    opensearch_dashboards_uuid: string;
+    osd_uuid: string;
     opensearch_uuid: string;
     account_id: string;
     license: LicenseUsage;

diff --git a/src/plugins/visualizations/public/legacy/build_pipeline.ts b/src/plugins/visualizations/public/legacy/build_pipeline.ts
@@ -393,7 +393,7 @@ export const buildPipeline = async (vis: Vis, params: BuildPipelineParams) => {
   const { uiState, title } = vis;
 
   // context
-  let pipeline = `opensearch_dashboards | opensearch_dashboards_context `;
+  let pipeline = `opensearchDashboards | opensearch_dashboards_context `;
   if (query) {
     pipeline += prepareJson('query', query);
   }