[Moving] Move Uptime folder into /x-pack/observability_solution (el…

…astic#177466)

## Summary

This PR is part of the initiative to consolidate Observability plugins
into `x-pack/plugins/observability_solution`.

This PR is strictly a move and an update in references.

This was discussed and agreed upon with the Observability org in the
Observability Office Hours meeting at the end of 2023.

## Related PRs:
- [ ] [Move APM ](elastic#177433)
- [x] [Move Data Quality](elastic#177456)
- [x] [Move Exploratory
View](elastic#177440)
- [ ] [Move Infra](elastic#177443)
- [X] Move Logs Explorer
- [x] [Move Observability AI
Assistant](elastic#177427)
- [ ] [Move Observability
App](elastic#177437)
- [x] [Move Observability
Onboarding](elastic#177458)
- [x] [Move Observability
Shared](elastic#177463)
- [x] [Move Profiling](elastic#177453)
- [x] [Move Synthetics](elastic#177464) 
- [ ] [Move Uptime](elastic#177466) <--
you are here
- [x] [Move UX](elastic#177470)

---------

Co-authored-by: kibanamachine <[email protected]>

.buildkite/ftr_configs.yml

@@ -58,8 +58,8 @@ disabled:
   - x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
 
   # Elastic Synthetics configs
+  - x-pack/plugins/observability_solution/uptime/e2e/uptime/synthetics_run.ts
   - x-pack/plugins/observability_solution/synthetics/e2e/config.ts
-  - x-pack/plugins/uptime/e2e/uptime/synthetics_run.ts
   - x-pack/plugins/observability_solution/synthetics/e2e/synthetics/synthetics_run.ts
   - x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts
   - x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts

.buildkite/scripts/steps/functional/uptime_plugin.sh

@@ -13,4 +13,4 @@ echo "--- Uptime plugin @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node plugins/observability_solution/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.github/CODEOWNERS

@@ -844,7 +844,7 @@ src/plugins/unified_histogram @elastic/kibana-data-discovery
 src/plugins/unified_search @elastic/kibana-visualizations
 packages/kbn-unsaved-changes-badge @elastic/kibana-data-discovery
 x-pack/plugins/upgrade_assistant @elastic/platform-deployment-management
-x-pack/plugins/uptime @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/uptime @elastic/obs-ux-infra_services-team
 x-pack/plugins/drilldowns/url_drilldown @elastic/appex-sharedux
 src/plugins/url_forwarding @elastic/kibana-visualizations
 src/plugins/usage_collection @elastic/kibana-core

api_docs/alerting.devdocs.json

@@ -3377,19 +3377,19 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/common.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/common.ts"
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/status_check.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/status_check.ts"
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/tls.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/tls.ts"
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/duration_anomaly.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/duration_anomaly.ts"
               },
               {
                 "plugin": "ruleRegistry",

api_docs/deprecations_by_plugin.mdx

@@ -1612,10 +1612,10 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibAlertingPluginApi" section="def-server.RuleExecutorServices.alertFactory" text="alertFactory"/> | [common.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/common.ts#:~:text=alertFactory), [status_check.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/status_check.ts#:~:text=alertFactory), [tls.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/tls.ts#:~:text=alertFactory), [duration_anomaly.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/server/legacy_uptime/lib/alerts/duration_anomaly.ts#:~:text=alertFactory) | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [alert_messages.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx#:~:text=toMountPoint), [alert_messages.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint) | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider), [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider), [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider) | - |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [uptime_settings.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/uptime/server/legacy_uptime/lib/saved_objects/uptime_settings.ts#:~:text=migrations) | - |
+| <DocLink id="kibAlertingPluginApi" section="def-server.RuleExecutorServices.alertFactory" text="alertFactory"/> | [common.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/common.ts#:~:text=alertFactory), [status_check.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/status_check.ts#:~:text=alertFactory), [tls.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/tls.ts#:~:text=alertFactory), [duration_anomaly.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/duration_anomaly.ts#:~:text=alertFactory) | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [alert_messages.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx#:~:text=toMountPoint), [alert_messages.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint), [ml_flyout_container.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx#:~:text=toMountPoint) | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider), [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider), [uptime_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx#:~:text=KibanaThemeProvider) | - |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [uptime_settings.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/saved_objects/uptime_settings.ts#:~:text=migrations) | - |
 
 
 

api_docs/kbn_core_http_server.devdocs.json

@@ -4359,7 +4359,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "watcher",
@@ -6731,7 +6731,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "watcher",
@@ -8119,7 +8119,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "watcher",
@@ -9035,7 +9035,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "watcher",
@@ -13509,7 +13509,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "controls",
@@ -13886,7 +13886,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/uptime_server.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/uptime_server.ts"
               },
               {
                 "plugin": "@kbn/core-http-router-server-internal",

api_docs/kbn_core_saved_objects_server.devdocs.json

@@ -9860,7 +9860,7 @@
               },
               {
                 "plugin": "uptime",
-                "path": "x-pack/plugins/uptime/server/legacy_uptime/lib/saved_objects/uptime_settings.ts"
+                "path": "x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/saved_objects/uptime_settings.ts"
               },
               {
                 "plugin": "dashboard",

api_docs/kibana_react.devdocs.json

@@ -1659,15 +1659,15 @@
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/app/uptime_app.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/app/uptime_app.tsx"
           },
           {
             "plugin": "watcher",
@@ -3142,23 +3142,23 @@
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/lib/alert_types/alert_messages.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
           },
           {
             "plugin": "uptime",
-            "path": "x-pack/plugins/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
+            "path": "x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/ml/ml_flyout_container.tsx"
           },
           {
             "plugin": "cloudLinks",

api_docs/uptime.devdocs.json

@@ -29,15 +29,13 @@
         "tags": [],
         "label": "UPTIME_RULE_TYPES",
         "description": [],
-        "signature": [
-          "string[]"
-        ],
-        "path": "x-pack/plugins/uptime/common/constants/uptime_alerts.ts",
+        "signature": ["string[]"],
+        "path": "x-pack/plugins/observability_solution/uptime/common/constants/uptime_alerts.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
       }
     ],
     "objects": []
   }
-}
+}

docs/developer/plugin-list.asciidoc

@@ -848,7 +848,7 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona
 |Upgrade Assistant helps users prepare their Stack for being upgraded to the next version of the Elastic stack.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/uptime/README.md[uptime]
+|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/uptime/README.md[uptime]
 |The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
 in their infrastructure.
 

package.json

@@ -833,7 +833,7 @@
     "@kbn/unified-search-plugin": "link:src/plugins/unified_search",
     "@kbn/unsaved-changes-badge": "link:packages/kbn-unsaved-changes-badge",
     "@kbn/upgrade-assistant-plugin": "link:x-pack/plugins/upgrade_assistant",
-    "@kbn/uptime-plugin": "link:x-pack/plugins/uptime",
+    "@kbn/uptime-plugin": "link:x-pack/plugins/observability_solution/uptime",
     "@kbn/url-drilldown-plugin": "link:x-pack/plugins/drilldowns/url_drilldown",
     "@kbn/url-forwarding-plugin": "link:src/plugins/url_forwarding",
     "@kbn/usage-collection-plugin": "link:src/plugins/usage_collection",

packages/kbn-babel-preset/styled_components_files.js

@@ -14,7 +14,7 @@ module.exports = {
   USES_STYLED_COMPONENTS: [
     /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
     /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/,
-    /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|uptime)[\/\\]/,
+    /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
     /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
     /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/,
     /x-pack[\/\\]packages[\/\\]security-solution[\/\\]ecs_data_quality_dashboard[\/\\]/,

tsconfig.base.json

@@ -1682,8 +1682,8 @@
       "@kbn/unsaved-changes-badge/*": ["packages/kbn-unsaved-changes-badge/*"],
       "@kbn/upgrade-assistant-plugin": ["x-pack/plugins/upgrade_assistant"],
       "@kbn/upgrade-assistant-plugin/*": ["x-pack/plugins/upgrade_assistant/*"],
-      "@kbn/uptime-plugin": ["x-pack/plugins/uptime"],
-      "@kbn/uptime-plugin/*": ["x-pack/plugins/uptime/*"],
+      "@kbn/uptime-plugin": ["x-pack/plugins/observability_solution/uptime"],
+      "@kbn/uptime-plugin/*": ["x-pack/plugins/observability_solution/uptime/*"],
       "@kbn/url-drilldown-plugin": ["x-pack/plugins/drilldowns/url_drilldown"],
       "@kbn/url-drilldown-plugin/*": ["x-pack/plugins/drilldowns/url_drilldown/*"],
       "@kbn/url-forwarding-plugin": ["src/plugins/url_forwarding"],

x-pack/.i18nrc.json

@@ -98,9 +98,9 @@
     "xpack.transform": "plugins/transform",
     "xpack.triggersActionsUI": "plugins/triggers_actions_ui",
     "xpack.upgradeAssistant": "plugins/upgrade_assistant",
+    "xpack.uptime": ["plugins/observability_solution/uptime"],
     "xpack.synthetics": ["plugins/observability_solution/synthetics"],
     "xpack.ux": ["plugins/observability_solution/ux"],
-    "xpack.uptime": ["plugins/uptime"],
     "xpack.urlDrilldown": "plugins/drilldowns/url_drilldown",
     "xpack.watcher": "plugins/watcher"
   },

x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts

@@ -30,7 +30,7 @@ async function runE2ETests({ readConfigFile }: FtrConfigProviderContext) {
         'rum_test_data',
       ]);
       await syntheticsRunner.loadTestData(
-        path.join(__dirname, '../../../synthetics/e2e/fixtures/es_archiver/'),
+        path.join(__dirname, '../../synthetics/e2e/fixtures/es_archiver/'),
         ['full_heartbeat', 'browser']
       );
       await syntheticsRunner.loadTestFiles(async () => {

x-pack/plugins/uptime/e2e/config.ts → x-pack/plugins/observability_solution/uptime/e2e/config.ts

@@ -14,10 +14,10 @@ const SERVICE_USERNAME = 'xpack.uptime.service.username';
 
 async function config({ readConfigFile }: FtrConfigProviderContext) {
   const kibanaCommonTestsConfig = await readConfigFile(
-    require.resolve('../../../../test/common/config.js')
+    require.resolve('../../../../../test/common/config.js')
   );
   const xpackFunctionalTestsConfig = await readConfigFile(
-    require.resolve('../../../test/functional/config.base.js')
+    require.resolve('../../../../test/functional/config.base.js')
   );
 
   const kibanaConfig = readKibanaConfig();

x-pack/plugins/uptime/e2e/tasks/es_archiver.ts → x-pack/plugins/observability_solution/uptime/e2e/tasks/es_archiver.ts

@@ -16,22 +16,22 @@ const NODE_TLS_REJECT_UNAUTHORIZED = '1';
 export const esArchiverLoad = (folder: string) => {
   const path = Path.join(ES_ARCHIVE_DIR, folder);
   execSync(
-    `node ../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.base.js`,
+    `node ../../../../../scripts/es_archiver load "${path}" --config ../../../../test/functional/config.base.js`,
     { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' }
   );
 };
 
 export const esArchiverUnload = (folder: string) => {
   const path = Path.join(ES_ARCHIVE_DIR, folder);
   execSync(
-    `node ../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.base.js`,
+    `node ../../../../../scripts/es_archiver unload "${path}" --config ../../../../test/functional/config.base.js`,
     { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' }
   );
 };
 
 export const esArchiverResetKibana = () => {
   execSync(
-    `node ../../../../scripts/es_archiver empty-kibana-index --config ../../../test/functional/config.base.js`,
+    `node ../../../../../scripts/es_archiver empty-kibana-index --config ../../../../test/functional/config.base.js`,
     { env: { ...process.env, NODE_TLS_REJECT_UNAUTHORIZED }, stdio: 'inherit' }
   );
 };

x-pack/plugins/uptime/e2e/tasks/read_kibana_config.ts → x-pack/plugins/observability_solution/uptime/e2e/tasks/read_kibana_config.ts

@@ -12,7 +12,7 @@ import yaml from 'js-yaml';
 export type KibanaConfig = ReturnType<typeof readKibanaConfig>;
 
 export const readKibanaConfig = () => {
-  const kibanaConfigDir = path.join(__filename, '../../../../../../config');
+  const kibanaConfigDir = path.join(__filename, '../../../../../../../config');
   const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');
   const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');