Merge remote-tracking branch 'origin/master' into orkohunter/techdocs-publish-to-cloud-storage

.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-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/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/friendly-news-know.md

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

.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/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/tall-hairs-switch.md

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