@backstage/plugin-kubernetes 0.7.1-next.0 → 0.7.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @backstage/plugin-kubernetes
 
+## 0.7.1
+
+### Patch Changes
+
+- 860ed68343: Fixed bug in CronJobsAccordions component that causes an error when cronjobs use a kubernetes alias, such as `@hourly` or `@daily` instead of standard cron syntax.
+- f563b86a5b: Adds namespace column to Kubernetes error reporting table
+- Updated dependencies
+  - @backstage/plugin-kubernetes-common@0.4.1
+  - @backstage/core-components@0.11.0
+  - @backstage/core-plugin-api@1.0.5
+  - @backstage/plugin-catalog-react@1.1.3
+
+## 0.7.1-next.2
+
+### Patch Changes
+
+- f563b86a5b: Adds namespace column to Kubernetes error reporting table
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.1.3-next.2
+  - @backstage/core-components@0.11.0-next.2
+
+## 0.7.1-next.1
+
+### Patch Changes
+
+- 860ed68343: Fixed bug in CronJobsAccordions component that causes an error when cronjobs use a kubernetes alias, such as `@hourly` or `@daily` instead of standard cron syntax.
+- Updated dependencies
+  - @backstage/core-components@0.10.1-next.1
+  - @backstage/plugin-catalog-react@1.1.3-next.1
+
 ## 0.7.1-next.0
 
 ### Patch Changes

package/dist/index.d.ts

@@ -173,6 +173,7 @@ declare type DetectedErrorsByCluster = Map<string, DetectedError[]>;
 interface DetectedError {
     severity: ErrorSeverity;
     cluster: string;
+    namespace: string;
     kind: ErrorDetectableKind;
     names: string[];
     message: string[];

package/dist/index.esm.js

@@ -254,12 +254,17 @@ const ErrorPanel$1 = ({
 const columns = [
   {
     title: "cluster",
-    width: "15%",
+    width: "10%",
     render: (detectedError) => detectedError.cluster
   },
+  {
+    title: "namespace",
+    width: "10%",
+    render: (detectedError) => detectedError.namespace
+  },
   {
     title: "kind",
-    width: "15%",
+    width: "10%",
     render: (detectedError) => detectedError.kind
   },
   {
@@ -501,7 +506,7 @@ const podStatusToMemoryUtil = (podStatus) => {
 };
 
 const detectErrorsInObjects = (objects, kind, clusterName, errorMappers) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const errors = /* @__PURE__ */ new Map();
   for (const object of objects) {
     for (const errorMapper of errorMappers) {
@@ -510,6 +515,7 @@ const detectErrorsInObjects = (objects, kind, clusterName, errorMappers) => {
         const dedupKey = message.join("");
         const value = errors.get(dedupKey);
         const name = (_b = (_a = object.metadata) == null ? void 0 : _a.name) != null ? _b : "unknown";
+        const namespace = (_d = (_c = object.metadata) == null ? void 0 : _c.namespace) != null ? _d : "unknown";
         if (value !== void 0) {
           value.names.push(name);
           errors.set(dedupKey, value);
@@ -519,7 +525,8 @@ const detectErrorsInObjects = (objects, kind, clusterName, errorMappers) => {
             kind,
             names: [name],
             message,
-            severity: errorMapper.severity
+            severity: errorMapper.severity,
+            namespace
           });
         }
       }
@@ -1978,6 +1985,24 @@ const CronJobDrawer = ({
   }))));
 };
 
+const k8sCronAliases = /* @__PURE__ */ new Map([
+  ["@yearly", "0 0 1 1 *"],
+  ["@annually", "0 0 1 1 *"],
+  ["@monthly", "0 0 1 * *"],
+  ["@weekly", "0 0 * * 0"],
+  ["@daily", "0 0 * * *"],
+  ["@midnight", "0 0 * * *"],
+  ["@hourly", "0 * * * *"]
+]);
+const humanizeCron = (schedule) => {
+  const deAliasedSchedule = k8sCronAliases.get(schedule) || schedule;
+  try {
+    return cronstrue.toString(deAliasedSchedule);
+  } catch (e) {
+    return deAliasedSchedule;
+  }
+};
+
 const CronJobSummary = ({ cronJob }) => {
   var _a, _b;
   return /* @__PURE__ */ React__default.createElement(Grid, {
@@ -2009,7 +2034,7 @@ const CronJobSummary = ({ cronJob }) => {
     item: true
   }, /* @__PURE__ */ React__default.createElement(Typography, {
     variant: "body1"
-  }, "Schedule:", " ", ((_b = cronJob.spec) == null ? void 0 : _b.schedule) ? `${cronJob.spec.schedule} (${cronstrue.toString(
+  }, "Schedule:", " ", ((_b = cronJob.spec) == null ? void 0 : _b.schedule) ? `${cronJob.spec.schedule} (${humanizeCron(
     cronJob.spec.schedule
   )})` : "N/A"))));
 };