Skip to content

Commit

Permalink
Relocating module @kbn/uptime-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
gsoldevila committed Dec 10, 2024
1 parent 794aaeb commit 104ab2d
Show file tree
Hide file tree
Showing 822 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .buildkite/ftr_oblt_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ disabled:
- x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts

#FTR configs
- x-pack/plugins/observability_solution/uptime/e2e/config.ts
- x-pack/solutions/observability/plugins/uptime/e2e/config.ts

# Elastic Synthetics configs
- x-pack/plugins/observability_solution/uptime/e2e/uptime/synthetics_run.ts
- x-pack/solutions/observability/plugins/uptime/e2e/uptime/synthetics_run.ts
- x-pack/solutions/observability/plugins/synthetics/e2e/config.ts
- x-pack/solutions/observability/plugins/synthetics/e2e/synthetics/synthetics_run.ts
- x-pack/solutions/observability/plugins/exploratory_view/e2e/synthetics_run.ts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/uptime_plugin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ echo "--- Uptime plugin @elastic/synthetics Tests"

cd "$XPACK_DIR"

node plugins/observability_solution/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
node solutions/observability/plugins/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,6 @@ x-pack/plugins/observability_solution/observability_onboarding/e2e @elastic/obs-
x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
x-pack/plugins/observability_solution/uptime @elastic/obs-ux-management-team
x-pack/plugins/observability_solution/ux @elastic/obs-ux-infra_services-team
x-pack/plugins/osquery @elastic/security-defend-workflows
x-pack/plugins/painless_lab @elastic/kibana-management
Expand Down Expand Up @@ -997,6 +996,7 @@ x-pack/solutions/observability/plugins/serverless_observability @elastic/obs-ux-
x-pack/solutions/observability/plugins/slo @elastic/obs-ux-management-team
x-pack/solutions/observability/plugins/synthetics @elastic/obs-ux-management-team
x-pack/solutions/observability/plugins/synthetics/e2e @elastic/obs-ux-management-team
x-pack/solutions/observability/plugins/uptime @elastic/obs-ux-management-team
x-pack/test
x-pack/test_serverless
x-pack/test/alerting_api_integration/common/plugins/aad @elastic/response-ops
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,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/observability_solution/uptime/README.md[uptime]
|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/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
4 changes: 2 additions & 2 deletions oas_docs/overlays/alerting.overlays.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ actions:
# SLO burn rate (slo.rules.burnRate)
- $ref: '../../x-pack/solutions/observability/plugins/slo/server/lib/rules/slo_burn_rate/docs/params_property_slo_burn_rate.yaml'
# Synthetics uptime TLS rule (xpack.uptime.alerts.tls)
- $ref: '../../x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_uptime_tls.yaml'
- $ref: '../../x-pack/solutions/observability/plugins/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_uptime_tls.yaml'
# Uptime monitor status rule (xpack.uptime.alerts.monitorStatus)
- $ref: '../../x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_monitor_status.yaml'
- $ref: '../../x-pack/solutions/observability/plugins/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_monitor_status.yaml'
# TBD
# Anomaly detection alert rule (xpack.ml.anomaly_detection_alert)
# Anomaly detection jobs health rule (xpack.ml.anomaly_detection_jobs_health)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@
"@kbn/unsaved-changes-badge": "link:packages/kbn-unsaved-changes-badge",
"@kbn/unsaved-changes-prompt": "link:packages/kbn-unsaved-changes-prompt",
"@kbn/upgrade-assistant-plugin": "link:x-pack/plugins/upgrade_assistant",
"@kbn/uptime-plugin": "link:x-pack/plugins/observability_solution/uptime",
"@kbn/uptime-plugin": "link:x-pack/solutions/observability/plugins/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
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1992,8 +1992,8 @@
"@kbn/unsaved-changes-prompt/*": ["packages/kbn-unsaved-changes-prompt/*"],
"@kbn/upgrade-assistant-plugin": ["x-pack/plugins/upgrade_assistant"],
"@kbn/upgrade-assistant-plugin/*": ["x-pack/plugins/upgrade_assistant/*"],
"@kbn/uptime-plugin": ["x-pack/plugins/observability_solution/uptime"],
"@kbn/uptime-plugin/*": ["x-pack/plugins/observability_solution/uptime/*"],
"@kbn/uptime-plugin": ["x-pack/solutions/observability/plugins/uptime"],
"@kbn/uptime-plugin/*": ["x-pack/solutions/observability/plugins/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
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"xpack.triggersActionsUI": "plugins/triggers_actions_ui",
"xpack.upgradeAssistant": "plugins/upgrade_assistant",
"xpack.uptime": [
"plugins/observability_solution/uptime"
"solutions/observability/plugins/uptime"
],
"xpack.synthetics": [
"solutions/observability/plugins/synthetics"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ script for standing up the test server.

### Start the server

From `~/x-pack/plugins/observability_solution/uptime/scripts`, run `node uptime_e2e.js --server`. Wait for the server to startup. It will provide you
From `~/x-pack/solutions/observability/plugins/uptime/scripts`, run `node uptime_e2e.js --server`. Wait for the server to startup. It will provide you
with an example run command when it finishes.

### Run the tests
Expand Down
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' }
);
};
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../../../../tsconfig.base.json",
"extends": "../../../../../../tsconfig.base.json",
"exclude": ["tmp", "target/**/*"],
"include": ["**/*"],
"compilerOptions": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/x-pack/plugins/observability_solution/uptime'],
rootDir: '../../../../..',
roots: ['<rootDir>/x-pack/solutions/observability/plugins/uptime'],
coverageDirectory:
'<rootDir>/target/kibana-coverage/jest/x-pack/plugins/observability_solution/uptime',
'<rootDir>/target/kibana-coverage/jest/x-pack/solutions/observability/plugins/uptime',
coverageReporters: ['text', 'html'],
collectCoverageFrom: [
'<rootDir>/x-pack/plugins/observability_solution/uptime/{common,public,server}/**/*.{ts,tsx}',
'<rootDir>/x-pack/solutions/observability/plugins/uptime/{common,public,server}/**/*.{ts,tsx}',
],
};
Loading

0 comments on commit 104ab2d

Please sign in to comment.