[2.7] Redo pick from main to 2.7 (#385)

Signed-off-by: Peter Fitzgibbons <pjfitz@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Eric Wei <menwe@amazon.com>
Signed-off-by: Rupal Mahajan <maharup@amazon.com>
Signed-off-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Signed-off-by: Shenoy Pratik <sgguruda@amazon.com>
Signed-off-by: Joshua Li <joshuali925@gmail.com>
Co-authored-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Peter Fitzgibbons <pjfitz@amazon.com>
Co-authored-by: Derek Ho <dxho@amazon.com>
Co-authored-by: Peter Fitzgibbons <peter.fitzgibbons@gmail.com>
Co-authored-by: Rupal Mahajan <maharup@amazon.com>
Co-authored-by: Kavitha Conjeevaram Mohan <mohakavi@amazon.com>
Co-authored-by: Shenoy Pratik <sgguruda@amazon.com>

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
+*   @opensearch-project/observability

MAINTAINERS.md

@@ -12,13 +12,4 @@
 | 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      |
-| 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      |
+| Peter Fitzgibbons | [pjfitzgibbons](https://github.com/pjfitzgibbons) | Amazon      |

common/constants/shared.ts

@@ -27,6 +27,30 @@ export const observabilityID = 'observability-logs';
 export const observabilityTitle = 'Observability';
 export const observabilityPluginOrder = 6000;
 
+export const observabilityApplicationsID = 'observability-applications';
+export const observabilityApplicationsTitle = 'Applications';
+export const observabilityApplicationsPluginOrder = 5090;
+
+export const observabilityLogsID = 'observability-logs';
+export const observabilityLogsTitle = 'Logs';
+export const observabilityLogsPluginOrder = 5091;
+
+export const observabilityMetricsID = 'observability-metrics';
+export const observabilityMetricsTitle = 'Metrics';
+export const observabilityMetricsPluginOrder = 5092;
+
+export const observabilityTracesID = 'observability-traces';
+export const observabilityTracesTitle = 'Traces';
+export const observabilityTracesPluginOrder = 5093;
+
+export const observabilityNotebookID = 'observability-notebooks';
+export const observabilityNotebookTitle = 'Notebooks';
+export const observabilityNotebookPluginOrder = 5094;
+
+export const observabilityPanelsID = 'observability-dashboards';
+export const observabilityPanelsTitle = 'Dashboards';
+export const observabilityPanelsPluginOrder = 5095;
+
 // Shared Constants
 export const SQL_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
 export const PPL_DOCUMENTATION_URL =

package.json

@@ -5,20 +5,11 @@
   "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",
-    "prepare": "husky install",
-    "lint:es": "node ../../scripts/eslint",
-    "lint": "yarn lint:es"
-  },
-  "lint-staged": {
-    "*.{ts,tsx,js,jsx}": [
-      "yarn lint --fix",
-      "git add"
-    ]
+    "plugin_helpers": "node ../../scripts/plugin_helpers"
   },
   "dependencies": {
     "@algolia/autocomplete-core": "^1.4.1",
@@ -30,13 +21,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",
-    "performance-now": "^2.1.0"
+    "redux-persist": "^6.0.0"
   },
   "devDependencies": {
     "@cypress/skip-test": "^2.6.1",
@@ -47,9 +38,7 @@
     "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": {

public/components/application_analytics/components/flyout_components/service_detail_flyout.tsx

@@ -19,10 +19,7 @@ import {
   handleServiceMapRequest,
   handleServiceViewRequest,
 } from '../../../../../public/components/trace_analytics/requests/services_request_handler';
-import {
-  filtersToDsl,
-  processTimeStamp,
-} from '../../../../../public/components/trace_analytics/components/common/helper_functions';
+import { filtersToDsl, processTimeStamp } from '../../../../../public/components/trace_analytics/components/common/helper_functions';
 import { ServiceMap } from '../../../../../public/components/trace_analytics/components/services';
 import { ServiceObject } from '../../../../../public/components/trace_analytics/components/common/plots/service_map';
 import { SpanDetailTable } from '../../../../../public/components/trace_analytics/components/traces/span_detail_table';
@@ -67,7 +64,7 @@ export function ServiceDetailFlyout(props: ServiceFlyoutProps) {
       ),
       getListItem(
         'Connected services',
-        fields.connected_services && fields.connected_services.length
+        fields.connected_services
           ? fields.connected_services.reduce((prev: string, curr: string) => {
               return [prev, ', ', curr];
             })
@@ -121,15 +118,7 @@ export function ServiceDetailFlyout(props: ServiceFlyoutProps) {
   }, [serviceName, fields, serviceMap, DSL, serviceMapIdSelected]);
 
   useEffect(() => {
-    const serviceDSL = filtersToDsl(
-      mode,
-      filters,
-      query,
-      processTimeStamp(startTime, mode),
-      processTimeStamp(endTime, mode),
-      'app',
-      appConfigs
-    );
+    const serviceDSL = filtersToDsl(mode, filters, query, processTimeStamp(startTime, mode), processTimeStamp(endTime, mode), 'app', appConfigs);
     handleServiceViewRequest(serviceName, http, serviceDSL, setFields, mode);
     handleServiceMapRequest(http, serviceDSL, mode, setServiceMap, serviceName);
     const spanDSL = filtersToDsl(mode, filters, query, startTime, endTime, 'app', appConfigs);