From 659ebc03404a061ea7806fee1cb67d98906ee197 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Wed, 1 Nov 2023 12:32:20 +0200 Subject: [PATCH 1/2] Reserve deactivated event --- common/cluster-api/src/main/proto/queue.proto | 1 + .../server/common/data/plugin/ComponentLifecycleEvent.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/cluster-api/src/main/proto/queue.proto b/common/cluster-api/src/main/proto/queue.proto index 480a7f3ba4..6bec57c770 100644 --- a/common/cluster-api/src/main/proto/queue.proto +++ b/common/cluster-api/src/main/proto/queue.proto @@ -787,6 +787,7 @@ enum ComponentLifecycleEvent { UPDATED = 4; STOPPED = 5; DELETED = 6; + DEACTIVATED = 7; } message ComponentLifecycleMsgProto { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java index 316a5cfdea..4dc4822b82 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java @@ -22,5 +22,5 @@ import java.io.Serializable; */ public enum ComponentLifecycleEvent implements Serializable { // In sync with ComponentLifecycleEvent proto - CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED + CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED, DEACTIVATED } From 268b9cc468acf64d8f8d131d153db542b1018b2e Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Wed, 1 Nov 2023 12:35:20 +0200 Subject: [PATCH 2/2] Reserve failed event --- common/cluster-api/src/main/proto/queue.proto | 17 +++++++++-------- .../data/plugin/ComponentLifecycleEvent.java | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/cluster-api/src/main/proto/queue.proto b/common/cluster-api/src/main/proto/queue.proto index 6bec57c770..b099e8d370 100644 --- a/common/cluster-api/src/main/proto/queue.proto +++ b/common/cluster-api/src/main/proto/queue.proto @@ -780,14 +780,15 @@ message FromDeviceRPCResponseProto { } enum ComponentLifecycleEvent { - CREATED = 0; - STARTED = 1; - ACTIVATED = 2; - SUSPENDED = 3; - UPDATED = 4; - STOPPED = 5; - DELETED = 6; - DEACTIVATED = 7; + CREATED = 0; + STARTED = 1; + ACTIVATED = 2; + SUSPENDED = 3; + UPDATED = 4; + STOPPED = 5; + DELETED = 6; + FAILED = 7; + DEACTIVATED = 8; } message ComponentLifecycleMsgProto { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java index 4dc4822b82..cbcf94445b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java @@ -22,5 +22,5 @@ import java.io.Serializable; */ public enum ComponentLifecycleEvent implements Serializable { // In sync with ComponentLifecycleEvent proto - CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED, DEACTIVATED + CREATED, STARTED, ACTIVATED, SUSPENDED, UPDATED, STOPPED, DELETED, FAILED, DEACTIVATED }