Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Moving] Move Uptime folder into /x-pack/observability_solution #177466

Merged
merged 10 commits into from
Feb 22, 2024
Merged

[Moving] Move Uptime folder into /x-pack/observability_solution #177466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1685ce4
Move plugin folder
CoenWarmer Feb 21, 2024
eda2cfb
Update references
CoenWarmer Feb 21, 2024
9ade0cd
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 21, 2024
56e40df
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 22, 2024
dd004df
[CI] Auto-commit changed files from 'node scripts/build_plugin_list_d…
kibanamachine Feb 22, 2024
fd70445
Update references
CoenWarmer Feb 22, 2024
23e0e61
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 22, 2024
24e318f
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 22, 2024
6542baf
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 22, 2024
2570ca4
Merge branch 'main' of github.com:elastic/kibana into feat/move-obs-p…
CoenWarmer Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .buildkite/ftr_configs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/uptime_plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}\"}
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions api_docs/alerting.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions api_docs/deprecations_by_plugin.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) | - |



Expand Down
12 changes: 6 additions & 6 deletions api_docs/kbn_core_http_server.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api_docs/kbn_core_saved_objects_server.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 8 additions & 8 deletions api_docs/kibana_react.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 3 additions & 5 deletions api_docs/uptime.devdocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
}
}
2 changes: 1 addition & 1 deletion docs/developer/plugin-list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/styled_components_files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[\/\\]/,
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
0 ...gins/uptime/.buildkite/pipelines/flaky.js → ...tion/uptime/.buildkite/pipelines/flaky.js
View file
Open in desktop
File renamed without changes.
0 ...gins/uptime/.buildkite/pipelines/flaky.sh → ...tion/uptime/.buildkite/pipelines/flaky.sh
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/README.md → ...s/observability_solution/uptime/README.md
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/config.ts → ...vability_solution/uptime/common/config.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/common/constants/capabilities.ts → ...n/uptime/common/constants/capabilities.ts
View file
Open in desktop
File renamed without changes.
0 ...e/common/constants/chart_format_limits.ts → ...e/common/constants/chart_format_limits.ts
View file
Open in desktop
File renamed without changes.
0 ...ptime/common/constants/client_defaults.ts → ...ptime/common/constants/client_defaults.ts
View file
Open in desktop
File renamed without changes.
0 ...time/common/constants/context_defaults.ts → ...time/common/constants/context_defaults.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/common/constants/data_filters.ts → ...n/uptime/common/constants/data_filters.ts
View file
Open in desktop
File renamed without changes.
0 .../plugins/uptime/common/constants/index.ts → ...solution/uptime/common/constants/index.ts
View file
Open in desktop
File renamed without changes.
0 ...plugins/uptime/common/constants/plugin.ts → ...olution/uptime/common/constants/plugin.ts
View file
Open in desktop
File renamed without changes.
0 .../plugins/uptime/common/constants/query.ts → ...solution/uptime/common/constants/query.ts
View file
Open in desktop
File renamed without changes.
0 ...ugins/uptime/common/constants/rest_api.ts → ...ution/uptime/common/constants/rest_api.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/constants/settings_defaults.ts → ...ime/common/constants/settings_defaults.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/constants/synthetics_alerts.ts → ...ime/common/constants/synthetics_alerts.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/constants/ui.ts → ...ty_solution/uptime/common/constants/ui.ts
View file
Open in desktop
File renamed without changes.
0 .../uptime/common/constants/uptime_alerts.ts → .../uptime/common/constants/uptime_alerts.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/field_names.ts → ...ity_solution/uptime/common/field_names.ts
View file
Open in desktop
File renamed without changes.
0 ...me/common/formatters/format_space_name.ts → ...me/common/formatters/format_space_name.ts
View file
Open in desktop
File renamed without changes.
0 ...plugins/uptime/common/formatters/index.ts → ...olution/uptime/common/formatters/index.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/index.ts → ...rvability_solution/uptime/common/index.ts
View file
Open in desktop
File renamed without changes.
0 ..._snapshots__/assert_close_to.test.ts.snap → ..._snapshots__/assert_close_to.test.ts.snap
View file
Open in desktop
File renamed without changes.
0 ...uptime/common/lib/assert_close_to.test.ts → ...uptime/common/lib/assert_close_to.test.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/uptime/common/lib/assert_close_to.ts → ...tion/uptime/common/lib/assert_close_to.ts
View file
Open in desktop
File renamed without changes.
0 ...b/combine_filters_and_user_search.test.ts → ...b/combine_filters_and_user_search.test.ts
View file
Open in desktop
File renamed without changes.
0 ...on/lib/combine_filters_and_user_search.ts → ...on/lib/combine_filters_and_user_search.ts
View file
Open in desktop
File renamed without changes.
0 ...common/lib/get_histogram_interval.test.ts → ...common/lib/get_histogram_interval.test.ts
View file
Open in desktop
File renamed without changes.
0 ...time/common/lib/get_histogram_interval.ts → ...time/common/lib/get_histogram_interval.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/lib/index.ts → ...ility_solution/uptime/common/lib/index.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/lib/ml.test.ts → ...ity_solution/uptime/common/lib/ml.test.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/lib/ml.ts → ...vability_solution/uptime/common/lib/ml.ts
View file
Open in desktop
File renamed without changes.
0 ...time/common/lib/stringify_kueries.test.ts → ...time/common/lib/stringify_kueries.test.ts
View file
Open in desktop
File renamed without changes.
0 ...ns/uptime/common/lib/stringify_kueries.ts → ...on/uptime/common/lib/stringify_kueries.ts
View file
Open in desktop
File renamed without changes.
0 ...common/requests/get_certs_request_body.ts → ...common/requests/get_certs_request_body.ts
View file
Open in desktop
File renamed without changes.
0 ...uptime/common/rules/alert_actions.test.ts → ...uptime/common/rules/alert_actions.test.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/uptime/common/rules/alert_actions.ts → ...tion/uptime/common/rules/alert_actions.ts
View file
Open in desktop
File renamed without changes.
0 ...ommon/rules/legacy_uptime/translations.ts → ...ommon/rules/legacy_uptime/translations.ts
View file
Open in desktop
File renamed without changes.
0 ...lugins/uptime/common/rules/status_rule.ts → ...lution/uptime/common/rules/status_rule.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/rules/types.ts → ...ity_solution/uptime/common/rules/types.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/rules/uptime_rule_field_map.ts → ...ime/common/rules/uptime_rule_field_map.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/runtime_types/alerts/common.ts → ...ime/common/runtime_types/alerts/common.ts
View file
Open in desktop
File renamed without changes.
0 ...time/common/runtime_types/alerts/index.ts → ...time/common/runtime_types/alerts/index.ts
View file
Open in desktop
File renamed without changes.
0 ...mmon/runtime_types/alerts/status_check.ts → ...mmon/runtime_types/alerts/status_check.ts
View file
Open in desktop
File renamed without changes.
0 ...uptime/common/runtime_types/alerts/tls.ts → ...uptime/common/runtime_types/alerts/tls.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/uptime/common/runtime_types/certs.ts → ...tion/uptime/common/runtime_types/certs.ts
View file
Open in desktop
File renamed without changes.
0 ...ins/uptime/common/runtime_types/common.ts → ...ion/uptime/common/runtime_types/common.ts
View file
Open in desktop
File renamed without changes.
0 .../common/runtime_types/dynamic_settings.ts → .../common/runtime_types/dynamic_settings.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/uptime/common/runtime_types/index.ts → ...tion/uptime/common/runtime_types/index.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/runtime_types/monitor/index.ts → ...ime/common/runtime_types/monitor/index.ts
View file
Open in desktop
File renamed without changes.
0 ...common/runtime_types/monitor/locations.ts → ...common/runtime_types/monitor/locations.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/runtime_types/monitor/state.ts → ...ime/common/runtime_types/monitor/state.ts
View file
Open in desktop
File renamed without changes.
0 ...me/common/runtime_types/network_events.ts → ...me/common/runtime_types/network_events.ts
View file
Open in desktop
File renamed without changes.
0 .../common/runtime_types/ping/error_state.ts → .../common/runtime_types/ping/error_state.ts
View file
Open in desktop
File renamed without changes.
0 ...me/common/runtime_types/ping/histogram.ts → ...me/common/runtime_types/ping/histogram.ts
View file
Open in desktop
File renamed without changes.
0 ...uptime/common/runtime_types/ping/index.ts → ...uptime/common/runtime_types/ping/index.ts
View file
Open in desktop
File renamed without changes.
0 ...ime/common/runtime_types/ping/observer.ts → ...ime/common/runtime_types/ping/observer.ts
View file
Open in desktop
File renamed without changes.
0 .../uptime/common/runtime_types/ping/ping.ts → .../uptime/common/runtime_types/ping/ping.ts
View file
Open in desktop
File renamed without changes.
0 ...mon/runtime_types/ping/synthetics.test.ts → ...mon/runtime_types/ping/synthetics.test.ts
View file
Open in desktop
File renamed without changes.
0 ...e/common/runtime_types/ping/synthetics.ts → ...e/common/runtime_types/ping/synthetics.ts
View file
Open in desktop
File renamed without changes.
0 ...me/common/runtime_types/snapshot/index.ts → ...me/common/runtime_types/snapshot/index.ts
View file
Open in desktop
File renamed without changes.
0 .../runtime_types/snapshot/snapshot_count.ts → .../runtime_types/snapshot/snapshot_count.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/translations.ts → ...ty_solution/uptime/common/translations.ts
View file
Open in desktop
File renamed without changes.
0 ...ptime/common/translations/translations.ts → ...ptime/common/translations/translations.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/types/index.ts → ...ity_solution/uptime/common/types/index.ts
View file
Open in desktop
File renamed without changes.
0 ...e/common/types/integration_deprecation.ts → ...e/common/types/integration_deprecation.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/common/types/monitor_duration.ts → ...n/uptime/common/types/monitor_duration.ts
View file
Open in desktop
File renamed without changes.
0 ...uptime/common/types/synthetics_monitor.ts → ...uptime/common/types/synthetics_monitor.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/common/utils/as_mutable_array.ts → ...n/uptime/common/utils/as_mutable_array.ts
View file
Open in desktop
File renamed without changes.
0 .../plugins/uptime/common/utils/es_search.ts → ...solution/uptime/common/utils/es_search.ts
View file
Open in desktop
File renamed without changes.
0 ...ns/uptime/common/utils/get_monitor_url.ts → ...on/uptime/common/utils/get_monitor_url.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/common/utils/t_enum.ts → ...ty_solution/uptime/common/utils/t_enum.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/e2e/README.md → ...servability_solution/uptime/e2e/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions x-pack/plugins/uptime/e2e/config.ts → ...servability_solution/uptime/e2e/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
0 ...fixtures/es_archiver/browser/data.json.gz → ...fixtures/es_archiver/browser/data.json.gz
View file
Open in desktop
File renamed without changes.
0 ...ixtures/es_archiver/browser/mappings.json → ...ixtures/es_archiver/browser/mappings.json
View file
Open in desktop
File renamed without changes.
0 ...s/es_archiver/full_heartbeat/data.json.gz → ...s/es_archiver/full_heartbeat/data.json.gz
View file
Open in desktop
File renamed without changes.
0 .../es_archiver/full_heartbeat/mappings.json → .../es_archiver/full_heartbeat/mappings.json
View file
Open in desktop
File renamed without changes.
0 .../es_archiver/synthetics_data/data.json.gz → .../es_archiver/synthetics_data/data.json.gz
View file
Open in desktop
File renamed without changes.
0 ...plugins/uptime/e2e/helpers/make_checks.ts → ...olution/uptime/e2e/helpers/make_checks.ts
View file
Open in desktop
File renamed without changes.
0 ...k/plugins/uptime/e2e/helpers/make_ping.ts → ..._solution/uptime/e2e/helpers/make_ping.ts
View file
Open in desktop
File renamed without changes.
0 ...ck/plugins/uptime/e2e/helpers/make_tls.ts → ...y_solution/uptime/e2e/helpers/make_tls.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/e2e/helpers/parse_args_params.ts → ...n/uptime/e2e/helpers/parse_args_params.ts
View file
Open in desktop
File renamed without changes.
0 ...lugins/uptime/e2e/helpers/record_video.ts → ...lution/uptime/e2e/helpers/record_video.ts
View file
Open in desktop
File renamed without changes.
0 ...s/uptime/e2e/helpers/synthetics_runner.ts → ...n/uptime/e2e/helpers/synthetics_runner.ts
View file
Open in desktop
File renamed without changes.
0 ...ugins/uptime/e2e/helpers/test_reporter.ts → ...ution/uptime/e2e/helpers/test_reporter.ts
View file
Open in desktop
File renamed without changes.
0 x-pack/plugins/uptime/e2e/helpers/utils.ts → ...lity_solution/uptime/e2e/helpers/utils.ts
View file
Open in desktop
File renamed without changes.
0 ...plugins/uptime/e2e/page_objects/login.tsx → ...olution/uptime/e2e/page_objects/login.tsx
View file
Open in desktop
File renamed without changes.
0 ...plugins/uptime/e2e/page_objects/utils.tsx → ...olution/uptime/e2e/page_objects/utils.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...k/plugins/uptime/e2e/tasks/es_archiver.ts → ..._solution/uptime/e2e/tasks/es_archiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
);
};
2 changes: 1 addition & 1 deletion ...ns/uptime/e2e/tasks/read_kibana_config.ts → ...on/uptime/e2e/tasks/read_kibana_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
Loading