Merge branch 'master' into ryanv/product-insights-intervals

.changeset/brave-zoos-fail.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-jenkins': patch
+---
+
+Avoid loading data from Jenkins twice. Don't load data when navigating through the pages as all data from all pages is already loaded.

.changeset/chatty-pens-bathe.md

@@ -0,0 +1,65 @@
+---
+'@backstage/plugin-sentry': minor
+'@backstage/plugin-sentry-backend': minor
+---
+
+The plugin uses the `proxy-backend` instead of a custom `sentry-backend`.
+It requires a proxy configuration:
+
+`app-config.yaml`:
+
+```yaml
+proxy:
+  '/sentry/api':
+    target: https://sentry.io/api/
+    allowedMethods: ['GET']
+    headers:
+      Authorization:
+        $env: SENTRY_TOKEN # export SENTRY_TOKEN="Bearer <your-sentry-token>"
+```
+
+The `MockApiBackend` is no longer configured by the `NODE_ENV` variable.
+Instead, the mock backend can be used with an api-override:
+
+`packages/app/src/apis.ts`:
+
+```ts
+import { createApiFactory } from '@backstage/core';
+import { MockSentryApi, sentryApiRef } from '@backstage/plugin-sentry';
+
+export const apis = [
+  // ...
+
+  createApiFactory(sentryApiRef, new MockSentryApi()),
+];
+```
+
+If you already use the Sentry backend, you must remove it from the backend:
+
+Delete `packages/backend/src/plugins/sentry.ts`.
+
+```diff
+# packages/backend/package.json
+
+...
+    "@backstage/plugin-scaffolder-backend": "^0.3.2",
+-   "@backstage/plugin-sentry-backend": "^0.1.3",
+    "@backstage/plugin-techdocs-backend": "^0.3.0",
+...
+```
+
+```diff
+// packages/backend/src/index.html
+
+  const apiRouter = Router();
+  apiRouter.use('/catalog', await catalog(catalogEnv));
+  apiRouter.use('/rollbar', await rollbar(rollbarEnv));
+  apiRouter.use('/scaffolder', await scaffolder(scaffolderEnv));
+- apiRouter.use('/sentry', await sentry(sentryEnv));
+  apiRouter.use('/auth', await auth(authEnv));
+  apiRouter.use('/techdocs', await techdocs(techdocsEnv));
+  apiRouter.use('/kubernetes', await kubernetes(kubernetesEnv));
+  apiRouter.use('/proxy', await proxy(proxyEnv));
+  apiRouter.use('/graphql', await graphql(graphqlEnv));
+  apiRouter.use(notFoundHandler());
+```

.changeset/cost-insights-quick-lizards-smash.md

@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-cost-insights': minor
+---
+
+Add support for multiple types of entity cost breakdown.
+
+This change is backwards-incompatible with plugin-cost-insights 0.3.x; the `entities` field on Entity returned in product cost queries changed from `Entity[]` to `Record<string, Entity[]`.

.changeset/cost-insights-wild-pumpkins-tie.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cost-insights': minor
+---
+
+Remove calendar MoM period option and fix quarter end date logic

.changeset/dull-dingos-dream.md

@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Update experimental backend bundle command to only output archives to `dist/` instead of a full workspace mirror in `dist-workspace/`.

.changeset/fast-frogs-wave.md

@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fixes a big in the bundling logic that caused `node_modules` inside local monorepo packages to be transformed.

.changeset/flat-flowers-learn.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+refreshAllLocations uses a child logger of the HigherOrderOperation with a meta `component` : `catalog-all-locations-refresh`

.changeset/fluffy-pillows-smile.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': patch
+---
+
+Batch the fetching of relations

.changeset/friendly-news-know.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cost-insights': patch
+---
+
+fix react-hooks/exhaustive-deps error

.changeset/late-tomatoes-sleep.md

@@ -0,0 +1,13 @@
+---
+'@backstage/create-app': patch
+---
+
+Add `"files": ["dist"]` to both app and backend packages. This ensures that packaged versions of these packages do not contain unnecessary files.
+
+To apply this change to an existing app, add the following to `packages/app/package.json` and `packages/backend/package.json`:
+
+```json
+  "files": [
+    "dist"
+  ]
+```

.changeset/lazy-beans-search.md

@@ -0,0 +1,6 @@
+---
+'@backstage/backend-common': patch
+'@backstage/integration': patch
+---
+
+Move the core url and auth logic to integration for the four major providers

.changeset/nine-forks-sleep.md

@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Add the basics of cross-integration concerns

.changeset/purple-radios-complain.md

@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-jenkins': patch
+---
+
+Improve loading speed of the CI/CD page.
+Only request the necessary fields from Jenkins to keep the request size low.
+In addition everything is loaded in a single request, instead of requesting
+each job and build individually. As this (and also the previous behavior) can
+lead to a big amount of data, this limits the amount of jobs to 50.
+For each job, only the latest build is loaded. Loading the full build history
+of a job can lead to excessive load on the Jenkins instance.

.changeset/rare-cooks-tan.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core': patch
+---
+
+Fix React warning of descendant paragraph tag

.changeset/rare-lemons-hug.md

@@ -0,0 +1,83 @@
+---
+'@backstage/backend-common': minor
+---
+
+Removes the Prometheus integration from `backend-common`.
+
+Rational behind this change is to keep the metrics integration of Backstage
+generic. Instead of directly relying on Prometheus, Backstage will expose
+metrics in a generic way. Integrators can then export the metrics in their
+desired format. For example using Prometheus.
+
+To keep the existing behavior, you need to integrate Prometheus in your
+backend:
+
+First, add a dependency on `express-prom-bundle` and `prom-client` to your backend.
+
+```diff
+// packages/backend/package.json
+  "dependencies": {
++   "express-prom-bundle": "^6.1.0",
++   "prom-client": "^12.0.0",
+```
+
+Then, add a handler for metrics and a simple instrumentation for the endpoints.
+
+```typescript
+// packages/backend/src/metrics.ts
+import { useHotCleanup } from '@backstage/backend-common';
+import { RequestHandler } from 'express';
+import promBundle from 'express-prom-bundle';
+import prom from 'prom-client';
+import * as url from 'url';
+
+const rootRegEx = new RegExp('^/([^/]*)/.*');
+const apiRegEx = new RegExp('^/api/([^/]*)/.*');
+
+export function normalizePath(req: any): string {
+  const path = url.parse(req.originalUrl || req.url).pathname || '/';
+
+  // Capture /api/ and the plugin name
+  if (apiRegEx.test(path)) {
+    return path.replace(apiRegEx, '/api/$1');
+  }
+
+  // Only the first path segment at root level
+  return path.replace(rootRegEx, '/$1');
+}
+
+/**
+ * Adds a /metrics endpoint, register default runtime metrics and instrument the router.
+ */
+export function metricsHandler(): RequestHandler {
+  // We can only initialize the metrics once and have to clean them up between hot reloads
+  useHotCleanup(module, () => prom.register.clear());
+
+  return promBundle({
+    includeMethod: true,
+    includePath: true,
+    // Using includePath alone is problematic, as it will include path labels with high
+    // cardinality (e.g. path params). Instead we would have to template them. However, this
+    // is difficult, as every backend plugin might use different routes. Instead we only take
+    // the first directory of the path, to have at least an idea how each plugin performs:
+    normalizePath,
+    promClient: { collectDefaultMetrics: {} },
+  });
+}
+```
+
+Last, extend your router configuration with the `metricsHandler`:
+
+```diff
++import { metricsHandler } from './metrics';
+
+...
+
+  const service = createServiceBuilder(module)
+    .loadConfig(config)
+    .addRouter('', await healthcheck(healthcheckEnv))
++   .addRouter('', metricsHandler())
+    .addRouter('/api', apiRouter);
+```
+
+Your Prometheus metrics will be available at the `/metrics` endpoint.

.changeset/red-worms-fold.md

@@ -0,0 +1,9 @@
+---
+'@backstage/core-api': patch
+---
+
+Deprecated the `ConcreteRoute`, `MutableRouteRef`, `AbsoluteRouteRef` types and added a new `RouteRef` type as replacement.
+
+Deprecated and disabled the `createSubRoute` method of `AbsoluteRouteRef`.
+
+Add an as of yet unused `params` option to `createRouteRef`.

.changeset/seven-tips-begin.md

@@ -0,0 +1,13 @@
+---
+'@backstage/plugin-api-docs': minor
+---
+
+Stop exposing a custom router from the `api-docs` plugin. Instead, use the
+widgets exported by the plugin to compose your custom entity pages.
+
+Instead of displaying the API definitions directly in the API tab of the
+component, it now contains tables linking to the API entities. This also adds
+new widgets to display relationships (bot provides & consumes relationships)
+between components and APIs.
+
+See the changelog of `create-app` for a migration guide.

.changeset/seven-tips-more.md

@@ -0,0 +1,136 @@
+---
+'@backstage/create-app': patch
+---
+
+Adjust template to the latest changes in the `api-docs` plugin.
+
+## Template Changes
+
+While updating to the latest `api-docs` plugin, the following changes are
+necessary for the `create-app` template in your
+`app/src/components/catalog/EntityPage.tsx`. This adds:
+
+- A custom entity page for API entities
+- Changes the API tab to include the new `ConsumedApisCard` and
+  `ProvidedApisCard` that link to the API entity.
+
+```diff
+ import {
++  ApiDefinitionCard,
+-  Router as ApiDocsRouter,
++  ConsumedApisCard,
++  ProvidedApisCard,
++  ConsumedApisCard,
++  ConsumingComponentsCard,
++  ProvidedApisCard,
++  ProvidingComponentsCard
+ } from '@backstage/plugin-api-docs';
+
+...
+
++const ComponentApisContent = ({ entity }: { entity: Entity }) => (
++  <Grid container spacing={3} alignItems="stretch">
++    <Grid item md={6}>
++      <ProvidedApisCard entity={entity} />
++    </Grid>
++    <Grid item md={6}>
++      <ConsumedApisCard entity={entity} />
++    </Grid>
++  </Grid>
++);
+
+ const ServiceEntityPage = ({ entity }: { entity: Entity }) => (
+   <EntityPageLayout>
+     <EntityPageLayout.Content
+      path="/"
+      title="Overview"
+      element={<OverviewContent entity={entity} />}
+    />
+    <EntityPageLayout.Content
+      path="/ci-cd/*"
+      title="CI/CD"
+      element={<CICDSwitcher entity={entity} />}
+    />
+    <EntityPageLayout.Content
+      path="/api/*"
+      title="API"
+-     element={<ApiDocsRouter entity={entity} />}
++     element={<ComponentApisContent entity={entity} />}
+    />
+...
+
+-export const EntityPage = () => {
+-  const { entity } = useEntity();
+-  switch (entity?.spec?.type) {
+-    case 'service':
+-      return <ServiceEntityPage entity={entity} />;
+-    case 'website':
+-      return <WebsiteEntityPage entity={entity} />;
+-    default:
+-      return <DefaultEntityPage entity={entity} />;
+-  }
+-};
+
++export const ComponentEntityPage = ({ entity }: { entity: Entity }) => {
++  switch (entity?.spec?.type) {
++    case 'service':
++      return <ServiceEntityPage entity={entity} />;
++    case 'website':
++      return <WebsiteEntityPage entity={entity} />;
++    default:
++      return <DefaultEntityPage entity={entity} />;
++  }
++};
++
++const ApiOverviewContent = ({ entity }: { entity: Entity }) => (
++  <Grid container spacing={3}>
++    <Grid item md={6}>
++      <AboutCard entity={entity} />
++    </Grid>
++    <Grid container item md={12}>
++      <Grid item md={6}>
++        <ProvidingComponentsCard entity={entity} />
++      </Grid>
++      <Grid item md={6}>
++        <ConsumingComponentsCard entity={entity} />
++      </Grid>
++    </Grid>
++  </Grid>
++);
++
++const ApiDefinitionContent = ({ entity }: { entity: ApiEntity }) => (
++  <Grid container spacing={3}>
++    <Grid item xs={12}>
++      <ApiDefinitionCard apiEntity={entity} />
++    </Grid>
++  </Grid>
++);
++
++const ApiEntityPage = ({ entity }: { entity: Entity }) => (
++  <EntityPageLayout>
++    <EntityPageLayout.Content
++      path="/*"
++      title="Overview"
++      element={<ApiOverviewContent entity={entity} />}
++    />
++    <EntityPageLayout.Content
++      path="/definition/*"
++      title="Definition"
++      element={<ApiDefinitionContent entity={entity as ApiEntity} />}
++    />
++  </EntityPageLayout>
++);
++
++export const EntityPage = () => {
++  const { entity } = useEntity();
++
++  switch (entity?.kind?.toLowerCase()) {
++    case 'component':
++      return <ComponentEntityPage entity={entity} />;
++    case 'api':
++      return <ApiEntityPage entity={entity} />;
++    default:
++      return <DefaultEntityPage entity={entity} />;
++  }
++};
+```

.changeset/silent-boxes-exercise.md

@@ -0,0 +1,8 @@
+---
+'@backstage/catalog-model': minor
+'@backstage/plugin-catalog-backend': minor
+---
+
+Remove the deprecated fields `ancestors` and `descendants` from the `Group` entity.
+
+See https://github.com/backstage/backstage/issues/3049 and the PRs linked from it for details.

.changeset/silly-kiwis-rest.md

@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-techdocs': minor
+---
+
+Removed modifyCss transformer and moved the css to injectCss transformer
+Fixed issue where some internal doc links would cause a reload of the page

.changeset/small-comics-cover.md

@@ -0,0 +1,5 @@
+---
+'@backstage/theme': patch
+---
+
+Add a little more padding in dense tables

.changeset/tall-hairs-switch.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core': patch
+---
+
+Export the `defaultConfigLoader` implementation