Cohesion main to 2.7 (opensearch-project#382)

Signed-off-by: Eric Wei <menwe@amazon.com> Signed-off-by: Joshua Li <joshuali925@gmail.com> Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com> Signed-off-by: Shenoy Pratik <sgguruda@amazon.com> Signed-off-by: Derek Ho <dxho@amazon.com> Co-authored-by: Derek Ho <dxho@amazon.com> Co-authored-by: Eric Wei <menwe@amazon.com> Co-authored-by: Joshua Li <joshuali925@gmail.com> Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com> Co-authored-by: Shenoy Pratik <sgguruda@amazon.com> Co-authored-by: Rupal Mahajan <maharup@amazon.com>
joshuali925 · Apr 18, 2023 · 946d9f6 · 946d9f6
1 parent 48a28a0
commit 946d9f6
Show file tree

Hide file tree

Showing 76 changed files with 4,377 additions and 1,162 deletions.
diff --git a/.cypress/integration/3_panels.spec.js → .cypress/integration/3_panels.spec.ts b/.cypress/integration/3_panels.spec.js → .cypress/integration/3_panels.spec.ts
diff --git a/.cypress/plugins/index.js b/.cypress/plugins/index.js
@@ -17,10 +17,14 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
+
 /**
  * @type {Cypress.PluginConfig}
  */
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits
   // `config` is the resolved Cypress config
+  require('cypress-watch-and-reload/plugins')(config)
+
+  return config
 }
diff --git a/.cypress/support/index.js b/.cypress/support/index.js
@@ -18,6 +18,8 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
+import 'cypress-watch-and-reload/support'
+
 // Import commands.js using ES2015 syntax:
 import './commands';
 

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
+*   @pjfitzgibbons @anirudha @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -12,4 +12,13 @@
 | Rupal Mahajan     | [rupal-bq](https://github.com/rupal-bq)           | Amazon      |
 | Derek Ho          | [derek-ho](https://github.com/derek-ho)           | Amazon      |
 | Lior Perry        | [YANG-DB](https://github.com/YANG-DB)             | Amazon      |
-| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon      |
+| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon      |
+| Simeon Widdis     | [swiddis] (https://github.com/swiddis)            | Amazon      |
+
+## Emeritus Maintainers
+
+| Maintainer        | GitHub ID                                               | Affiliation |
+| ----------------- | ------------------------------------------------------- | ----------- |
+| Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
+| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)                 | Amazon      |
+| Nick Knize        | [nknize](https://github.com/nknize)                     | Amazon      |
diff --git a/common/constants/custom_panels.ts b/common/constants/custom_panels.ts
@@ -4,5 +4,10 @@
  */
 
 export const CUSTOM_PANELS_API_PREFIX = '/api/observability/operational_panels';
-export const CUSTOM_PANELS_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest/observability-plugin/operational-panels/';
+export const CUSTOM_PANELS_DOCUMENTATION_URL =
+  'https://opensearch.org/docs/latest/observability-plugin/operational-panels/';
 export const CREATE_PANEL_MESSAGE = 'Enter a name to describe the purpose of this custom panel.';
+
+export const CUSTOM_PANELS_SAVED_OBJECT_TYPE = 'observability-panel';
+
+export const CUSTOM_PANEL_SLICE = 'customPanel';
diff --git a/common/constants/shared.ts b/common/constants/shared.ts
@@ -23,7 +23,7 @@ export const PPL_ENDPOINT = '/_plugins/_ppl';
 export const SQL_ENDPOINT = '/_plugins/_sql';
 export const DSL_ENDPOINT = '/_plugins/_dsl';
 
-export const observabilityID = 'observability-dashboards';
+export const observabilityID = 'observability-logs';
 export const observabilityTitle = 'Observability';
 export const observabilityPluginOrder = 6000;
 

diff --git a/common/types/custom_panels.ts b/common/types/custom_panels.ts
@@ -4,11 +4,19 @@
  */
 
 export interface CustomPanelListType {
-  name: string;
+  title: string;
   id: string;
   dateCreated: number;
   dateModified: number;
   applicationId?: string;
+  savedObject: boolean;
+}
+
+export interface BoxType {
+  x1: number;
+  y1: number;
+  x2: number;
+  y2: number;
 }
 
 export interface VisualizationType {
@@ -21,13 +29,19 @@ export interface VisualizationType {
 }
 
 export interface PanelType {
-  name: string;
+  title: string;
+  dateCreated: number;
+  dateModified: number;
   visualizations: VisualizationType[];
   timeRange: { to: string; from: string };
   queryFilter: { query: string; language: string };
   applicationId?: string;
 }
 
+export interface CustomPanelType extends PanelType {
+  id: string;
+}
+
 export interface SavedVisualizationType {
   id: string;
   name: string;
@@ -39,7 +53,7 @@ export interface SavedVisualizationType {
   user_configs: any;
 }
 
-export interface pplResponse {
+export interface PPLResponse {
   data: any;
   metadata: any;
   size: number;
@@ -50,3 +64,20 @@ export interface VizContainerError {
   errorMessage: string;
   errorDetails?: string;
 }
+
+export interface ObservabilityPanelAttrs {
+  title: string;
+  description: string;
+  dateCreated: number;
+  dateModified: number;
+  timeRange: {
+    to: string;
+    from: string;
+  };
+  queryFilter: {
+    query: string;
+    language: string;
+  };
+  visualizations: VisualizationType[];
+  applicationId: string;
+}
diff --git a/common/types/explorer.ts b/common/types/explorer.ts
@@ -37,6 +37,7 @@ import {
   SavedObjectAttributes,
   SavedObjectsStart,
 } from '../../../../src/core/public/saved_objects';
+import { ChromeBreadcrumb } from '../../../../src/core/public/chrome';
 
 export interface IQueryTab {
   id: string;
@@ -318,14 +319,15 @@ export interface Breadcrumbs {
 
 export interface EventAnalyticsProps {
   chrome: CoreSetup;
-  parentBreadcrumbs: Breadcrumbs[];
+  parentBreadcrumbs: ChromeBreadcrumb[];
   pplService: any;
   dslService: any;
   savedObjects: SavedObjectsStart;
   timestampUtils: TimestampUtils;
   http: HttpStart;
   notifications: NotificationsStart;
   queryManager: QueryManager;
+  setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => void;
 }
 
 export interface DataConfigPanelProps {

diff --git a/cypress.json b/cypress.json
@@ -1,7 +1,7 @@
 {
   "baseUrl": "http://localhost:5601",
   "video": true,
-  "chromeWebSecurity": false,
+  "chromeWebSecurity": true,
   "fixturesFolder": ".cypress/fixtures",
   "integrationFolder": ".cypress/integration",
   "pluginsFile": ".cypress/plugins/index.js",
@@ -19,5 +19,8 @@
     "opensearch": "localhost:9200",
     "opensearchDashboards": "localhost:5601",
     "security_enabled": true
+  },
+  "cypress-watch-and-reload": {
+    "watch": ["common/**", "public/**", "server/**"]
   }
 }
diff --git a/package.json b/package.json
@@ -5,11 +5,20 @@
   "license": "Apache-2.0",
   "scripts": {
     "osd": "node ../../scripts/osd",
-    "build": "yarn plugin_helpers build",
+    "build": "yarn plugin-helpers build",
     "test": "../../node_modules/.bin/jest --config ./test/jest.config.js",
     "cypress:run": "TZ=America/Los_Angeles cypress run",
     "cypress:open": "TZ=America/Los_Angeles cypress open",
-    "plugin_helpers": "node ../../scripts/plugin_helpers"
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
+    "prepare": "husky install",
+    "lint:es": "node ../../scripts/eslint",
+    "lint": "yarn lint:es"
+  },
+  "lint-staged": {
+    "*.{ts,tsx,js,jsx}": [
+      "yarn lint --fix",
+      "git add"
+    ]
   },
   "dependencies": {
     "@algolia/autocomplete-core": "^1.4.1",
@@ -21,13 +30,13 @@
     "ag-grid-react": "^27.3.0",
     "antlr4": "4.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
-    "performance-now": "^2.1.0",
     "plotly.js-dist": "^2.2.0",
     "postinstall": "^0.7.4",
     "react-graph-vis": "^1.0.5",
     "react-paginate": "^8.1.3",
     "react-plotly.js": "^2.5.1",
-    "redux-persist": "^6.0.0"
+    "redux-persist": "^6.0.0",
+    "performance-now": "^2.1.0"
   },
   "devDependencies": {
     "@cypress/skip-test": "^2.6.1",
@@ -36,8 +45,11 @@
     "@types/react-test-renderer": "^16.9.1",
     "antlr4ts-cli": "^0.5.0-alpha.4",
     "cypress": "^6.0.0",
+    "cypress-watch-and-reload": "^1.10.6",
     "eslint": "^6.8.0",
+    "husky": "6.0.0",
     "jest-dom": "^4.0.0",
+    "lint-staged": "^13.1.0",
     "ts-jest": "^29.1.0"
   },
   "resolutions": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
		* @pjfitzgibbons @anirudha @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis