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.

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

[Synthetics] Rename uptime plugin to synthetics #130037

Merged
merged 18 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/functional/uptime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ echo "--- Uptime @elastic/synthetics Tests"

cd "$XPACK_DIR"

checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
checks-reporter-with-killswitch "uptime plugin @elastic/synthetics Tests" \
node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
10 changes: 5 additions & 5 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,11 @@ the alertTypes by the Stack in the alerting plugin, register associated HTTP
routes, etc.


|{kib-repo}blob/{branch}/x-pack/plugins/synthetics/README.md[synthetics]
|The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
in their infrastructure.


|{kib-repo}blob/{branch}/x-pack/plugins/task_manager/README.md[taskManager]
|The task manager is a generic system for running background tasks.
Documentation: https://www.elastic.co/guide/en/kibana/master/task-manager-production-considerations.html
Expand Down Expand Up @@ -648,11 +653,6 @@ 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 major. It will only be enabled on the last minor before the next major release. This is controlled via the config: xpack.upgrade_assistant.readonly (#101296).


|{kib-repo}blob/{branch}/x-pack/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.


|{kib-repo}blob/{branch}/x-pack/plugins/drilldowns/url_drilldown/README.md[urlDrilldown]
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.

Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/styled_components_files.js
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[\/\\](unified_search|kibana_react)[\/\\]/,
/x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|osquery|security_solution|timelines|uptime|ux)[\/\\]/,
/x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|osquery|security_solution|timelines|synthetics|ux)[\/\\]/,
/x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
],
};
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ pageLoadAssetSize:
transform: 41007
triggersActionsUi: 103400
upgradeAssistant: 81241
uptime: 40825
urlForwarding: 32579
usageCollection: 39762
visDefaultEditor: 50178
Expand Down Expand Up @@ -128,3 +127,4 @@ pageLoadAssetSize:
expressionXY: 26500
eventAnnotation: 19334
screenshotting: 22870
synthetics: 40958
2 changes: 1 addition & 1 deletion src/dev/typescript/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const PROJECTS = [
name: 'fleet/cypress',
}),

createProject('x-pack/plugins/uptime/e2e/tsconfig.json', {
createProject('x-pack/plugins/synthetics/e2e/tsconfig.json', {
name: 'uptime/synthetics-e2e-tests',
disableTypeCheck: true,
}),
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@
"@kbn/spaces-plugin/*": ["x-pack/plugins/spaces/*"],
"@kbn/stack-alerts-plugin": ["x-pack/plugins/stack_alerts"],
"@kbn/stack-alerts-plugin/*": ["x-pack/plugins/stack_alerts/*"],
"@kbn/synthetics-plugin": ["x-pack/plugins/synthetics"],
"@kbn/synthetics-plugin/*": ["x-pack/plugins/synthetics/*"],
"@kbn/task-manager-plugin": ["x-pack/plugins/task_manager"],
"@kbn/task-manager-plugin/*": ["x-pack/plugins/task_manager/*"],
"@kbn/telemetry-collection-xpack-plugin": ["x-pack/plugins/telemetry_collection_xpack"],
Expand All @@ -405,8 +407,6 @@
"@kbn/ui-actions-enhanced-plugin/*": ["x-pack/plugins/ui_actions_enhanced/*"],
"@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/ux-plugin": ["x-pack/plugins/ux"],
"@kbn/ux-plugin/*": ["x-pack/plugins/ux/*"],
"@kbn/watcher-plugin": ["x-pack/plugins/watcher"],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/.i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"xpack.transform": "plugins/transform",
"xpack.triggersActionsUI": "plugins/triggers_actions_ui",
"xpack.upgradeAssistant": "plugins/upgrade_assistant",
"xpack.uptime": ["plugins/uptime"],
"xpack.uptime": ["plugins/synthetics"],
"xpack.ux": ["plugins/ux"],
"xpack.urlDrilldown": "plugins/drilldowns/url_drilldown",
"xpack.watcher": "plugins/watcher",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import { i18n } from '@kbn/i18n';
export const PLUGIN = {
APP_ROOT_ID: 'react-uptime-root',
DESCRIPTION: i18n.translate('xpack.uptime.pluginDescription', {
defaultMessage: 'Uptime monitoring',
defaultMessage: 'Synthetics monitoring',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are these two values displayed? Are they displayed to the end user?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think so.

Though the title goes here
image

description: 'The description text that will appear in the feature catalogue.',
}),
ID: 'uptime',
LOCAL_STORAGE_KEY: 'xpack.uptime',
NAME: i18n.translate('xpack.uptime.featureRegistry.uptimeFeatureName', {
defaultMessage: 'Uptime',
NAME: i18n.translate('xpack.uptime.featureRegistry.syntheticsFeatureName', {
defaultMessage: 'Synthetics and Uptime',
}),
TITLE: i18n.translate('xpack.uptime.uptimeFeatureCatalogueTitle', {
defaultMessage: 'Uptime',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
module.exports = {
preset: '@kbn/test',
rootDir: '../../..',
roots: ['<rootDir>/x-pack/plugins/uptime'],
coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/uptime',
roots: ['<rootDir>/x-pack/plugins/synthetics'],
coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/synthetics',
coverageReporters: ['text', 'html'],
collectCoverageFrom: ['<rootDir>/x-pack/plugins/uptime/{common,public,server}/**/*.{ts,tsx}'],
collectCoverageFrom: ['<rootDir>/x-pack/plugins/synthetics/{common,public,server}/**/*.{ts,tsx}'],
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"configPath": ["xpack", "uptime"],
"id": "uptime",
"id": "synthetics",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we agreed not to change the id as of yet. I'm not against it, but wondering why you decided to go ahead and change it now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

feature id is what matters most, so i decided to go ahead with it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elastic/actionable-observability can you remind me if the values above are meant to be the plugin id?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most likely feature id, since there are two from infra plugin logs and infrastructure

"kibanaVersion": "kibana",
"optionalPlugins": ["cloud", "data", "fleet", "home", "ml", "telemetry"],
"requiredPlugins": [
Expand Down
Loading