mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
[EPM] Final(?) update from integrations_manager -> EPM (#50976)
* Update (all remaining?) references from integrations_manager to EPM * Update path in i18n file
This commit is contained in:
parent
8aa89d70ce
commit
be9ca17924
90 changed files with 18 additions and 18 deletions
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
@ -30,7 +30,7 @@
|
|||
|
||||
# Logs & Metrics UI
|
||||
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
|
||||
/x-pack/legacy/plugins/integrations_manager/ @elastic/epm
|
||||
/x-pack/legacy/plugins/epm/ @elastic/epm
|
||||
|
||||
# Machine Learning
|
||||
/x-pack/legacy/plugins/ml/ @elastic/ml-ui
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
"xpack.canvas": "legacy/plugins/canvas",
|
||||
"xpack.crossClusterReplication": "legacy/plugins/cross_cluster_replication",
|
||||
"xpack.dashboardMode": "legacy/plugins/dashboard_mode",
|
||||
"xpack.epm":"legacy/plugins/integrations_manager",
|
||||
"xpack.epm":"legacy/plugins/epm",
|
||||
"xpack.features": "plugins/features",
|
||||
"xpack.fileUpload": "legacy/plugins/file_upload",
|
||||
"xpack.fleet": "legacy/plugins/fleet",
|
||||
|
|
|
@ -42,7 +42,7 @@ import { snapshotRestore } from './legacy/plugins/snapshot_restore';
|
|||
import { transform } from './legacy/plugins/transform';
|
||||
import { actions } from './legacy/plugins/actions';
|
||||
import { alerting } from './legacy/plugins/alerting';
|
||||
import { epm } from './legacy/plugins/integrations_manager';
|
||||
import { epm } from './legacy/plugins/epm';
|
||||
import { lens } from './legacy/plugins/lens';
|
||||
import { ingest } from './legacy/plugins/ingest';
|
||||
import { fleet } from './legacy/plugins/fleet';
|
||||
|
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
## Development
|
||||
### Branch
|
||||
We're using a long-running feature branch [`feature-integrations-manager`](https://github.com/elastic/kibana/tree/feature-integrations-manager).
|
||||
We're using a long-running feature branch [`feature-ingest`](https://github.com/elastic/kibana/tree/feature-ingest).
|
||||
|
||||
<details>
|
||||
<summary>Keeping up to date with upstream kibana</summary>
|
||||
|
||||
```bash
|
||||
## checkout feature branch to your fork
|
||||
git checkout -B feature-integrations-manager origin/feature-integrations-manager
|
||||
git checkout -B feature-ingest origin/feature-ingest
|
||||
|
||||
## make sure your feature branch is current with upstream feature branch
|
||||
git pull upstream feature-integrations-manager
|
||||
git pull upstream feature-ingest
|
||||
|
||||
## pull in changes from upstream master
|
||||
git pull upstream master
|
||||
|
@ -29,12 +29,12 @@ git push upstream
|
|||
</details>
|
||||
|
||||
### Feature development
|
||||
In your own fork of `elastic/kibana`, create a feature branch based on `feature-integrations-manager`.
|
||||
In your own fork of `elastic/kibana`, create a feature branch based on `feature-ingest`.
|
||||
|
||||
```
|
||||
git checkout -b 1234-feature-description feature-integrations-manager
|
||||
git checkout -b 1234-feature-description feature-ingest
|
||||
# ... git commits for feature
|
||||
open https://github.com/elastic/kibana/compare/feature-integrations-manager...yourgithubname:1234-feature-description
|
||||
open https://github.com/elastic/kibana/compare/feature-ingest...yourgithubname:1234-feature-description
|
||||
```
|
||||
|
||||
See https://github.com/elastic/kibana/pull/37950 for an example.
|
|
@ -18,7 +18,7 @@ export type ElasticsearchAssetType = 'ingest-pipeline' | 'index-template' | 'ilm
|
|||
|
||||
// Registry's response types
|
||||
// from /search
|
||||
// https://github.com/elastic/integrations-registry/blob/master/docs/api/search.json
|
||||
// https://github.com/elastic/package-registry/blob/master/docs/api/search.json
|
||||
export type RegistryList = RegistryListItem[];
|
||||
export interface RegistryListItem {
|
||||
description: string;
|
||||
|
@ -35,7 +35,7 @@ export interface ScreenshotItem {
|
|||
}
|
||||
|
||||
// from /package/{name}
|
||||
// https://github.com/elastic/integrations-registry/blob/master/docs/api/package.json
|
||||
// https://github.com/elastic/package-registry/blob/master/docs/api/package.json
|
||||
export type ServiceName = 'kibana' | 'elasticsearch';
|
||||
export type RequirementVersion = string;
|
||||
|
||||
|
@ -49,7 +49,7 @@ export interface RequirementVersionRange {
|
|||
}
|
||||
|
||||
// from /categories
|
||||
// https://github.com/elastic/integrations-registry/blob/master/docs/api/categories.json
|
||||
// https://github.com/elastic/package-registry/blob/master/docs/api/categories.json
|
||||
export type CategorySummaryList = CategorySummaryItem[];
|
||||
export type CategoryId = string;
|
||||
export interface CategorySummaryItem {
|
Before Width: | Height: | Size: 128 KiB After Width: | Height: | Size: 128 KiB |
|
@ -41,7 +41,7 @@ export function PackageCard({
|
|||
optionalIcon = <EuiIcon type={iconType} size="l" />;
|
||||
} else if (iconUrl) {
|
||||
// skipping b/c images from registry are Not Good
|
||||
// https://github.com/elastic/integrations-registry/issues/45
|
||||
// https://github.com/elastic/package-registry/issues/45
|
||||
// optionalIcon = (
|
||||
// <img
|
||||
// width="24"
|
|
@ -51,7 +51,7 @@ export async function getObjects(
|
|||
}
|
||||
|
||||
// the assets from the registry are malformed
|
||||
// https://github.com/elastic/integrations-registry/issues/42
|
||||
// https://github.com/elastic/package-registry/issues/42
|
||||
function ensureJsonValues(obj: SavedObjectToBe) {
|
||||
const { attributes } = obj;
|
||||
if (
|
|
@ -23,7 +23,7 @@ export async function installPackage(options: {
|
|||
});
|
||||
|
||||
if (toSave.length) {
|
||||
// Save those references in the integration manager's state saved object
|
||||
// Save those references in the package manager's state saved object
|
||||
await saveInstallationReferences({
|
||||
savedObjectsClient,
|
||||
pkgkey,
|
|
@ -14,7 +14,7 @@
|
|||
},
|
||||
"servers": [
|
||||
{
|
||||
"url": "http://localhost:5601/api/integrations_manager"
|
||||
"url": "http://localhost:5601/api/epm"
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
|
@ -134,4 +134,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
import expect from '@kbn/expect';
|
||||
import { FtrProviderContext } from '../../api_integration/ftr_provider_context';
|
||||
import { getTemplate } from '../../../legacy/plugins/integrations_manager/server/lib/template/template';
|
||||
import { getTemplate } from '../../../legacy/plugins/epm/server/lib/template/template';
|
||||
|
||||
export default function({ getService }: FtrProviderContext) {
|
||||
// This test was inspired by https://github.com/elastic/kibana/blob/master/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue