From d124248d80681692e99ab8f4a71fbfff7f1f5e23 Mon Sep 17 00:00:00 2001
From: Kawika Avilla <kavilla414@gmail.com>
Date: Fri, 12 Mar 2021 16:47:31 -0800
Subject: [PATCH] [Rename] telemetry and visualizations inconsistencies (#164)

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
---
 src/plugins/telemetry/schema/oss_plugins.json                 | 4 ++--
 src/plugins/telemetry/server/collectors/usage/schema.ts       | 4 ++--
 .../server/collectors/usage/telemetry_usage_collector.ts      | 4 ++--
 src/plugins/visualizations/public/legacy/build_pipeline.ts    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index cfbe4e1442bb..cedfdfca9c62 100644
--- 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
index 8b316396ec27..45b9b6ce4a2c 100644
--- 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
index c50c9ba5a357..6b68069ec5af 100644
--- 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
index 3a2739df870f..6e6b0a3f914e 100644
--- 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);
   }