@backstage-community/plugin-grafana 0.7.1 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @backstage-community/plugin-grafana
 
+## 0.9.0
+
+### Minor Changes
+
+- 59e5a3f: Backstage version bump to v1.43.2
+
+## 0.8.0
+
+### Minor Changes
+
+- c5b6192: Backstage version bump to v1.42.3
+
 ## 0.7.1
 
 ### Patch Changes

package/dist/alpha/apis.esm.js

@@ -1,35 +1,33 @@
-import { ApiBlueprint, createApiFactory, discoveryApiRef, identityApiRef, configApiRef, fetchApiRef } from '@backstage/frontend-plugin-api';
+import { ApiBlueprint, discoveryApiRef, identityApiRef, configApiRef, fetchApiRef } from '@backstage/frontend-plugin-api';
 import { grafanaApiRef, GrafanaApiClient, UnifiedAlertingGrafanaApiClient } from '../api.esm.js';
 
 const grafanaApiExtension = ApiBlueprint.make({
-  params: {
-    factory: createApiFactory({
-      api: grafanaApiRef,
-      deps: {
-        discoveryApi: discoveryApiRef,
-        identityApi: identityApiRef,
-        configApi: configApiRef,
-        fetchApi: fetchApiRef
-      },
-      factory: ({ discoveryApi, configApi, fetchApi }) => {
-        const unifiedAlertingEnabled = configApi.getOptionalBoolean("grafana.unifiedAlerting") || false;
-        if (!unifiedAlertingEnabled) {
-          return new GrafanaApiClient({
-            fetchApi,
-            discoveryApi,
-            domain: configApi.getString("grafana.domain"),
-            proxyPath: configApi.getOptionalString("grafana.proxyPath")
-          });
-        }
-        return new UnifiedAlertingGrafanaApiClient({
+  params: (defineParams) => defineParams({
+    api: grafanaApiRef,
+    deps: {
+      discoveryApi: discoveryApiRef,
+      identityApi: identityApiRef,
+      configApi: configApiRef,
+      fetchApi: fetchApiRef
+    },
+    factory: ({ discoveryApi, configApi, fetchApi }) => {
+      const unifiedAlertingEnabled = configApi.getOptionalBoolean("grafana.unifiedAlerting") || false;
+      if (!unifiedAlertingEnabled) {
+        return new GrafanaApiClient({
           fetchApi,
           discoveryApi,
           domain: configApi.getString("grafana.domain"),
           proxyPath: configApi.getOptionalString("grafana.proxyPath")
         });
       }
-    })
-  }
+      return new UnifiedAlertingGrafanaApiClient({
+        fetchApi,
+        discoveryApi,
+        domain: configApi.getString("grafana.domain"),
+        proxyPath: configApi.getOptionalString("grafana.proxyPath")
+      });
+    }
+  })
 });
 
 export { grafanaApiExtension };

package/dist/alpha/apis.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"apis.esm.js","sources":["../../src/alpha/apis.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  configApiRef,\n  ApiBlueprint,\n  createApiFactory,\n  discoveryApiRef,\n  fetchApiRef,\n  identityApiRef,\n} from '@backstage/frontend-plugin-api';\nimport {\n  GrafanaApiClient,\n  grafanaApiRef,\n  UnifiedAlertingGrafanaApiClient,\n} from '../api';\n\n/**\n * @alpha\n */\nexport const grafanaApiExtension = ApiBlueprint.make({\n  params: {\n    factory: createApiFactory({\n      api: grafanaApiRef,\n      deps: {\n        discoveryApi: discoveryApiRef,\n        identityApi: identityApiRef,\n        configApi: configApiRef,\n        fetchApi: fetchApiRef,\n      },\n      factory: ({ discoveryApi, configApi, fetchApi }) => {\n        const unifiedAlertingEnabled =\n          configApi.getOptionalBoolean('grafana.unifiedAlerting') || false;\n\n        if (!unifiedAlertingEnabled) {\n          return new GrafanaApiClient({\n            fetchApi,\n            discoveryApi,\n            domain: configApi.getString('grafana.domain'),\n            proxyPath: configApi.getOptionalString('grafana.proxyPath'),\n          });\n        }\n\n        return new UnifiedAlertingGrafanaApiClient({\n          fetchApi,\n          discoveryApi,\n          domain: configApi.getString('grafana.domain'),\n          proxyPath: configApi.getOptionalString('grafana.proxyPath'),\n        });\n      },\n    }),\n  },\n});\n"],"names":[],"mappings":";;;AAgCa,MAAA,mBAAA,GAAsB,aAAa,IAAK,CAAA;AAAA,EACnD,MAAQ,EAAA;AAAA,IACN,SAAS,gBAAiB,CAAA;AAAA,MACxB,GAAK,EAAA,aAAA;AAAA,MACL,IAAM,EAAA;AAAA,QACJ,YAAc,EAAA,eAAA;AAAA,QACd,WAAa,EAAA,cAAA;AAAA,QACb,SAAW,EAAA,YAAA;AAAA,QACX,QAAU,EAAA;AAAA,OACZ;AAAA,MACA,SAAS,CAAC,EAAE,YAAc,EAAA,SAAA,EAAW,UAAe,KAAA;AAClD,QAAA,MAAM,sBACJ,GAAA,SAAA,CAAU,kBAAmB,CAAA,yBAAyB,CAAK,IAAA,KAAA;AAE7D,QAAA,IAAI,CAAC,sBAAwB,EAAA;AAC3B,UAAA,OAAO,IAAI,gBAAiB,CAAA;AAAA,YAC1B,QAAA;AAAA,YACA,YAAA;AAAA,YACA,MAAA,EAAQ,SAAU,CAAA,SAAA,CAAU,gBAAgB,CAAA;AAAA,YAC5C,SAAA,EAAW,SAAU,CAAA,iBAAA,CAAkB,mBAAmB;AAAA,WAC3D,CAAA;AAAA;AAGH,QAAA,OAAO,IAAI,+BAAgC,CAAA;AAAA,UACzC,QAAA;AAAA,UACA,YAAA;AAAA,UACA,MAAA,EAAQ,SAAU,CAAA,SAAA,CAAU,gBAAgB,CAAA;AAAA,UAC5C,SAAA,EAAW,SAAU,CAAA,iBAAA,CAAkB,mBAAmB;AAAA,SAC3D,CAAA;AAAA;AACH,KACD;AAAA;AAEL,CAAC;;;;"}
+{"version":3,"file":"apis.esm.js","sources":["../../src/alpha/apis.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  configApiRef,\n  ApiBlueprint,\n  discoveryApiRef,\n  fetchApiRef,\n  identityApiRef,\n} from '@backstage/frontend-plugin-api';\nimport {\n  GrafanaApiClient,\n  grafanaApiRef,\n  UnifiedAlertingGrafanaApiClient,\n} from '../api';\n\n/**\n * @alpha\n */\nexport const grafanaApiExtension = ApiBlueprint.make({\n  params: defineParams =>\n    defineParams({\n      api: grafanaApiRef,\n      deps: {\n        discoveryApi: discoveryApiRef,\n        identityApi: identityApiRef,\n        configApi: configApiRef,\n        fetchApi: fetchApiRef,\n      },\n      factory: ({ discoveryApi, configApi, fetchApi }) => {\n        const unifiedAlertingEnabled =\n          configApi.getOptionalBoolean('grafana.unifiedAlerting') || false;\n\n        if (!unifiedAlertingEnabled) {\n          return new GrafanaApiClient({\n            fetchApi,\n            discoveryApi,\n            domain: configApi.getString('grafana.domain'),\n            proxyPath: configApi.getOptionalString('grafana.proxyPath'),\n          });\n        }\n\n        return new UnifiedAlertingGrafanaApiClient({\n          fetchApi,\n          discoveryApi,\n          domain: configApi.getString('grafana.domain'),\n          proxyPath: configApi.getOptionalString('grafana.proxyPath'),\n        });\n      },\n    }),\n});\n"],"names":[],"mappings":";;;AA+Ba,MAAA,mBAAA,GAAsB,aAAa,IAAK,CAAA;AAAA,EACnD,MAAA,EAAQ,kBACN,YAAa,CAAA;AAAA,IACX,GAAK,EAAA,aAAA;AAAA,IACL,IAAM,EAAA;AAAA,MACJ,YAAc,EAAA,eAAA;AAAA,MACd,WAAa,EAAA,cAAA;AAAA,MACb,SAAW,EAAA,YAAA;AAAA,MACX,QAAU,EAAA;AAAA,KACZ;AAAA,IACA,SAAS,CAAC,EAAE,YAAc,EAAA,SAAA,EAAW,UAAe,KAAA;AAClD,MAAA,MAAM,sBACJ,GAAA,SAAA,CAAU,kBAAmB,CAAA,yBAAyB,CAAK,IAAA,KAAA;AAE7D,MAAA,IAAI,CAAC,sBAAwB,EAAA;AAC3B,QAAA,OAAO,IAAI,gBAAiB,CAAA;AAAA,UAC1B,QAAA;AAAA,UACA,YAAA;AAAA,UACA,MAAA,EAAQ,SAAU,CAAA,SAAA,CAAU,gBAAgB,CAAA;AAAA,UAC5C,SAAA,EAAW,SAAU,CAAA,iBAAA,CAAkB,mBAAmB;AAAA,SAC3D,CAAA;AAAA;AAGH,MAAA,OAAO,IAAI,+BAAgC,CAAA;AAAA,QACzC,QAAA;AAAA,QACA,YAAA;AAAA,QACA,MAAA,EAAQ,SAAU,CAAA,SAAA,CAAU,gBAAgB,CAAA;AAAA,QAC5C,SAAA,EAAW,SAAU,CAAA,iBAAA,CAAkB,mBAAmB;AAAA,OAC3D,CAAA;AAAA;AACH,GACD;AACL,CAAC;;;;"}

package/dist/alpha.d.ts

@@ -10,19 +10,19 @@ import * as _backstage_core_plugin_api from '@backstage/core-plugin-api';
  *
  * @alpha
  */
-declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
-    [x: `api:${string}`]: _backstage_frontend_plugin_api.ExtensionDefinition<{
+declare const _default: _backstage_frontend_plugin_api.OverridableFrontendPlugin<{}, {}, {
+    "api:grafana": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "api";
         name: undefined;
         config: {};
         configInput: {};
-        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_core_plugin_api.AnyApiFactory, "core.api.factory", {}>;
+        output: _backstage_frontend_plugin_api.ExtensionDataRef<_backstage_core_plugin_api.AnyApiFactory, "core.api.factory", {}>;
         inputs: {};
-        params: {
-            factory: _backstage_core_plugin_api.AnyApiFactory;
-        };
+        params: <TApi, TImpl extends TApi, TDeps extends {
+            [x: string]: unknown;
+        }>(params: _backstage_core_plugin_api.ApiFactory<TApi, TImpl, TDeps>) => _backstage_frontend_plugin_api.ExtensionBlueprintParams<_backstage_core_plugin_api.AnyApiFactory>;
     }>;
-    [x: `entity-card:${string}/alerts`]: _backstage_frontend_plugin_api.ExtensionDefinition<{
+    "entity-card:grafana/alerts": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "entity-card";
         name: "alerts";
         config: {
@@ -33,11 +33,11 @@ declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
             filter?: _backstage_plugin_catalog_react_alpha.EntityPredicate | undefined;
             type?: "content" | "summary" | "info" | undefined;
         };
-        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+        output: _backstage_frontend_plugin_api.ExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<string, "catalog.entity-filter-expression", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
             optional: true;
         }>;
         inputs: {};
@@ -47,7 +47,7 @@ declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
             type?: _backstage_plugin_catalog_react_alpha.EntityCardType | undefined;
         };
     }>;
-    [x: `entity-card:${string}/dashboards`]: _backstage_frontend_plugin_api.ExtensionDefinition<{
+    "entity-card:grafana/dashboards": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "entity-card";
         name: "dashboards";
         config: {
@@ -58,11 +58,11 @@ declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
             filter?: _backstage_plugin_catalog_react_alpha.EntityPredicate | undefined;
             type?: "content" | "summary" | "info" | undefined;
         };
-        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+        output: _backstage_frontend_plugin_api.ExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<string, "catalog.entity-filter-expression", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
             optional: true;
         }>;
         inputs: {};
@@ -72,7 +72,7 @@ declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
             type?: _backstage_plugin_catalog_react_alpha.EntityCardType | undefined;
         };
     }>;
-    [x: `entity-card:${string}/overview-dashboard`]: _backstage_frontend_plugin_api.ExtensionDefinition<{
+    "entity-card:grafana/overview-dashboard": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "entity-card";
         name: "overview-dashboard";
         config: {
@@ -83,11 +83,11 @@ declare const _default: _backstage_frontend_plugin_api.FrontendPlugin<{}, {}, {
             filter?: _backstage_plugin_catalog_react_alpha.EntityPredicate | undefined;
             type?: "content" | "summary" | "info" | undefined;
         };
-        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+        output: _backstage_frontend_plugin_api.ExtensionDataRef<react.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<string, "catalog.entity-filter-expression", {
             optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
+        }> | _backstage_frontend_plugin_api.ExtensionDataRef<_backstage_plugin_catalog_react_alpha.EntityCardType, "catalog.entity-card-type", {
             optional: true;
         }>;
         inputs: {};

package/dist/alpha.esm.js

@@ -3,7 +3,7 @@ import { grafanaApiExtension } from './alpha/apis.esm.js';
 import { entityGrafanaAlertsCard, entityGrafanaDashboardsCard, entityGrafanaOverviewDashboardViewer } from './alpha/entityCards.esm.js';
 
 var alpha = createFrontendPlugin({
-  id: "grafana",
+  pluginId: "grafana",
   extensions: [
     grafanaApiExtension,
     entityGrafanaAlertsCard,

package/dist/alpha.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"alpha.esm.js","sources":["../src/alpha.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { createFrontendPlugin } from '@backstage/frontend-plugin-api';\nimport {\n  entityGrafanaAlertsCard,\n  entityGrafanaDashboardsCard,\n  entityGrafanaOverviewDashboardViewer,\n  grafanaApiExtension,\n} from './alpha/index';\n\n/**\n * The Grafana backstage plugin.\n *\n * @alpha\n */\nexport default createFrontendPlugin({\n  id: 'grafana',\n  extensions: [\n    grafanaApiExtension,\n    entityGrafanaAlertsCard,\n    entityGrafanaDashboardsCard,\n    entityGrafanaOverviewDashboardViewer,\n  ],\n});\n"],"names":[],"mappings":";;;;AA4BA,YAAe,oBAAqB,CAAA;AAAA,EAClC,EAAI,EAAA,SAAA;AAAA,EACJ,UAAY,EAAA;AAAA,IACV,mBAAA;AAAA,IACA,uBAAA;AAAA,IACA,2BAAA;AAAA,IACA;AAAA;AAEJ,CAAC,CAAA;;;;"}
+{"version":3,"file":"alpha.esm.js","sources":["../src/alpha.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { createFrontendPlugin } from '@backstage/frontend-plugin-api';\nimport {\n  entityGrafanaAlertsCard,\n  entityGrafanaDashboardsCard,\n  entityGrafanaOverviewDashboardViewer,\n  grafanaApiExtension,\n} from './alpha/index';\n\n/**\n * The Grafana backstage plugin.\n *\n * @alpha\n */\nexport default createFrontendPlugin({\n  pluginId: 'grafana',\n  extensions: [\n    grafanaApiExtension,\n    entityGrafanaAlertsCard,\n    entityGrafanaDashboardsCard,\n    entityGrafanaOverviewDashboardViewer,\n  ],\n});\n"],"names":[],"mappings":";;;;AA4BA,YAAe,oBAAqB,CAAA;AAAA,EAClC,QAAU,EAAA,SAAA;AAAA,EACV,UAAY,EAAA;AAAA,IACV,mBAAA;AAAA,IACA,uBAAA;AAAA,IACA,2BAAA;AAAA,IACA;AAAA;AAEJ,CAAC,CAAA;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage-community/plugin-grafana",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "A Backstage backend plugin that integrates towards Grafana",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",
@@ -63,10 +63,10 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^1.7.5",
-    "@backstage/core-components": "^0.17.4",
-    "@backstage/core-plugin-api": "^1.10.9",
-    "@backstage/frontend-plugin-api": "^0.10.4",
-    "@backstage/plugin-catalog-react": "^1.19.1",
+    "@backstage/core-components": "^0.18.1",
+    "@backstage/core-plugin-api": "^1.11.0",
+    "@backstage/frontend-plugin-api": "^0.12.0",
+    "@backstage/plugin-catalog-react": "^1.21.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/lab": "4.0.0-alpha.61",
     "cross-fetch": "^4.0.0",
@@ -79,11 +79,11 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.33.1",
-    "@backstage/core-app-api": "^1.18.0",
-    "@backstage/dev-utils": "^1.1.12",
-    "@backstage/frontend-test-utils": "^0.3.4",
-    "@backstage/test-utils": "^1.7.10",
+    "@backstage/cli": "^0.34.3",
+    "@backstage/core-app-api": "^1.19.0",
+    "@backstage/dev-utils": "^1.1.14",
+    "@backstage/frontend-test-utils": "^0.3.6",
+    "@backstage/test-utils": "^1.7.11",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^15.0.0",