Add status field to notification

packages/daemons/src/autoUpdates/sendUpdateNotification.ts

@@ -3,12 +3,7 @@ import { params } from "@dappnode/params";
 import * as db from "@dappnode/db";
 import { DappnodeInstaller } from "@dappnode/installer";
 import { prettyDnpName } from "@dappnode/utils";
-import {
-  CoreUpdateDataAvailable,
-  NotificationCategory,
-  NotificationPriority,
-  upstreamVersionToString
-} from "@dappnode/types";
+import { CoreUpdateDataAvailable, Category, Priority, upstreamVersionToString, Status } from "@dappnode/types";
 import { formatPackageUpdateNotification, formatSystemUpdateNotification } from "./formatNotificationBody.js";
 import { isCoreUpdateEnabled } from "./isCoreUpdateEnabled.js";
 import { isDnpUpdateEnabled } from "./isDnpUpdateEnabled.js";
@@ -56,8 +51,9 @@ export async function sendUpdatePackageNotificationMaybe({
         upstreamVersion,
         autoUpdatesEnabled: isDnpUpdateEnabled(dnpName)
       }),
-      category: NotificationCategory.core,
-      priority: NotificationPriority.low
+      category: Category.system,
+      priority: Priority.low,
+      status: Status.triggered
     })
     .catch((e) => logs.error("Error sending package update notification", e));
 
@@ -83,8 +79,9 @@ export async function sendUpdateSystemNotificationMaybe(data: CoreUpdateDataAvai
         packages: data.packages,
         autoUpdatesEnabled: isCoreUpdateEnabled()
       }),
-      category: NotificationCategory.core,
-      priority: NotificationPriority.low
+      category: Category.system,
+      priority: Priority.low,
+      status: Status.triggered
     })
     .catch((e) => logs.error("Error sending system update notification", e));
 

packages/daemons/src/diskUsage/index.ts

@@ -4,7 +4,7 @@ import { params } from "@dappnode/params";
 import { eventBus } from "@dappnode/eventbus";
 import { logs } from "@dappnode/logger";
 import { notifications } from "@dappnode/notifications";
-import { NotificationCategory, NotificationPriority } from "@dappnode/types";
+import { Category, Priority, Status } from "@dappnode/types";
 
 /**
  * Commands
@@ -105,8 +105,9 @@ async function monitorDiskUsage(): Promise<void> {
               stoppedDnpNames.map((dnpName) => ` - ${prettyDnpName(dnpName)}`).join("\n"),
               `Please, free up enough disk space and start them again.`
             ].join("\n\n"),
-            category: NotificationCategory.core,
-            priority: NotificationPriority.critical
+            category: Category.hardware,
+            priority: Priority.critical,
+            status: Status.triggered
           })
           .catch((e) => logs.error("Error sending disk usage notification", e));
 

packages/dappmanager/src/calls/setStaticIp.ts

@@ -4,7 +4,7 @@ import { eventBus } from "@dappnode/eventbus";
 import { logs } from "@dappnode/logger";
 import { notifications } from "@dappnode/notifications";
 import { params } from "@dappnode/params";
-import { NotificationCategory, NotificationPriority } from "@dappnode/types";
+import { Category, Priority, Status } from "@dappnode/types";
 
 /**
  * Sets the static IP
@@ -33,8 +33,9 @@ export async function setStaticIp({ staticIp }: { staticIp: string }): Promise<v
       title: "Static IP updated",
       body: `Your static IP was changed to ${staticIp}.`,
       dnpName: params.dappmanagerDnpName,
-      category: NotificationCategory.core,
-      priority: NotificationPriority.low
+      category: Category.system,
+      priority: Priority.low,
+      status: Status.triggered
     })
     .catch((e) => logs.error("Error sending static IP updated notification", e));
 

packages/schemas/test/unit/validateSchema.test.ts

@@ -9,9 +9,9 @@ import fs from "fs";
 import path from "path";
 import { cleanTestDir, testDir } from "../testUtils.js";
 import { Manifest, SetupWizard, NotificationsConfig, GatusEndpoint, CustomEndpoint } from "@dappnode/types";
-import { NotificationPriority } from "../../../types/src/notifications.js";
+import { Priority } from "../../../types/src/notifications.js";
 
-describe("schemaValidation", function () {
+describe.only("schemaValidation", function () {
   this.timeout(10000);
   describe("manifest", () => {
     before(() => {
@@ -453,7 +453,7 @@ volumes:
             conditions: ["response-time < 500ms", "status == 200"],
             interval: "1m",
             group: "example-group",
-            priority: NotificationPriority.low,
+            priority: Priority.low,
             alerts: [
               {
                 type: "custom",
@@ -509,7 +509,7 @@ volumes:
             conditions: ["response-time < 500ms"],
             interval: "1m",
             group: "example-group",
-            priority: NotificationPriority.low,
+            priority: Priority.low,
             alerts: [
               {
                 type: "response-time",
@@ -542,7 +542,7 @@ volumes:
             conditions: ["response-time < 500ms"],
             interval: "invalid-interval",
             group: "example-group",
-            priority: NotificationPriority.low,
+            priority: Priority.low,
             alerts: [
               {
                 type: "response-time",
@@ -603,7 +603,7 @@ volumes:
             enabled: true,
             name: "custom-endpoint",
             description: "A custom endpoint for testing", // Added required description
-            priority: NotificationPriority.high,
+            priority: Priority.high,
             metric: {
               treshold: 90,
               min: 0,
@@ -663,7 +663,7 @@ volumes:
             conditions: ["response-time < 500ms", "status == 200"],
             interval: "1m",
             group: "example-group",
-            priority: NotificationPriority.low,
+            priority: Priority.low,
             alerts: [
               {
                 type: "custom",
@@ -690,7 +690,7 @@ volumes:
             enabled: true,
             name: "custom-endpoint",
             description: "A custom endpoint for testing", // Added required description
-            priority: NotificationPriority.high,
+            priority: Priority.high,
             metric: {
               treshold: 90,
               min: 0,

packages/types/src/notifications.ts

@@ -12,8 +12,9 @@ export interface NotificationPayload {
   title: string;
   body: string;
   dnpName: string;
-  category: NotificationCategory;
-  priority: NotificationPriority;
+  category: Category;
+  priority: Priority;
+  status: Status;
   icon?: string;
   errors?: string;
   callToAction?: {
@@ -22,29 +23,34 @@ export interface NotificationPayload {
   };
 }
 
-export enum NotificationPriority {
+export enum Priority {
   low = "low",
   medium = "medium",
   high = "high",
   critical = "critical"
 }
 
-export enum NotificationCategory {
-  core = "core",
+export enum Status {
+  triggered = "triggered",
+  resolved = "resolved"
+}
+
+export enum Category {
+  system = "system",
   ethereum = "ethereum",
   holesky = "holesky",
   lukso = "lukso",
   gnosis = "gnosis",
   hoodi = "hoodi",
-  host = "host",
+  hardware = "hardware",
   other = "other"
 }
 
 export interface CustomEndpoint {
   name: string;
   enabled: boolean;
   description: string;
-  priority: NotificationPriority;
+  priority: Priority;
   metric?: {
     treshold: number;
     min: number;
@@ -61,7 +67,7 @@ export interface GatusEndpoint {
   conditions: string[];
   interval: string; // e.g., "1m"
   group: string;
-  priority: NotificationPriority;
+  priority: Priority; // dappnode specific
   alerts: Alert[];
   definition: {
     // dappnode specific