Add "tags" field to DTOs (#13367)

Graylog2 · Sep 29, 2022 · d65bbc5 · d65bbc5
1 parent a3655e7
commit d65bbc5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/sidecar/rest/models/NodeDetails.java b/graylog2-server/src/main/java/org/graylog/plugins/sidecar/rest/models/NodeDetails.java
@@ -50,12 +50,17 @@ public abstract class NodeDetails {
     @Nullable
     public abstract CollectorStatusList statusList();
 
+    @JsonProperty("tags")
+    @Nullable
+    public abstract List<String> tags();
+
     @JsonCreator
     public static NodeDetails create(@JsonProperty("operating_system") String operatingSystem,
                                      @JsonProperty("ip") @Nullable String ip,
                                      @JsonProperty("metrics") @Nullable NodeMetrics metrics,
                                      @JsonProperty("log_file_list") @Nullable List<NodeLogFile> logFileList,
-                                     @JsonProperty("status") @Nullable CollectorStatusList statusList) {
-        return new AutoValue_NodeDetails(operatingSystem, ip, metrics, logFileList, statusList);
+                                     @JsonProperty("status") @Nullable CollectorStatusList statusList,
+                                     @JsonProperty("tags") @Nullable List<String> tags) {
+        return new AutoValue_NodeDetails(operatingSystem, ip, metrics, logFileList, statusList, tags);
     }
 }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/sidecar/services/SidecarService.java b/graylog2-server/src/main/java/org/graylog/plugins/sidecar/services/SidecarService.java
@@ -89,8 +89,9 @@ public Sidecar save(Sidecar sidecar) {
             } else {
                 throw new IllegalArgumentException("Specified object failed validation: " + violations);
             }
-        } else
+        } else {
             throw new IllegalArgumentException("Specified object is not of correct implementation type (" + sidecar.getClass() + ")!");
+        }
     }
 
     public List<Sidecar> all() {
@@ -168,7 +169,8 @@ public int markExpired(Period period, String message) {
                                     nodeDetails.ip(),
                                     nodeDetails.metrics(),
                                     nodeDetails.logFileList(),
-                                    statusListToSave);
+                                    statusListToSave,
+                                    nodeDetails.tags());
 
                             Sidecar toSave = collector.toBuilder()
                                     .nodeDetails(nodeDetailsToSave)
@@ -194,7 +196,8 @@ public Sidecar fromRequest(String nodeId, RegistrationRequest request, String co
                         request.nodeDetails().ip(),
                         request.nodeDetails().metrics(),
                         request.nodeDetails().logFileList(),
-                        request.nodeDetails().statusList()),
+                        request.nodeDetails().statusList(),
+                        request.nodeDetails().tags()),
                 collectorVersion);
     }
 

diff --git a/...2-server/src/test/java/org/graylog/plugins/sidecar/collectors/SidecarServiceImplTest.java b/...2-server/src/test/java/org/graylog/plugins/sidecar/collectors/SidecarServiceImplTest.java
@@ -95,6 +95,7 @@ public void testSaveFirstRecord() throws Exception {
                         null,
                         null,
                         null,
+                        null,
                         null),
                 version
                 );

diff --git a/...server/src/test/java/org/graylog/plugins/sidecar/collectors/rest/SidecarResourceTest.java b/...server/src/test/java/org/graylog/plugins/sidecar/collectors/rest/SidecarResourceTest.java
@@ -125,6 +125,7 @@ public void testRegister() throws Exception {
                         null,
                         null,
                         null,
+                        null,
                         null
                 )
         );
@@ -144,6 +145,7 @@ public void testRegisterInvalidCollectorId() throws Exception {
                         null,
                         null,
                         null,
+                        null,
                         null
                 )
         );
@@ -164,6 +166,7 @@ public void testRegisterInvalidNodeId() throws Exception {
                         null,
                         null,
                         null,
+                        null,
                         null
                 )
         );
@@ -198,6 +201,7 @@ public void testRegisterMissingOperatingSystem() throws Exception {
                         null,
                         null,
                         null,
+                        null,
                         null
                 )
         );
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,7 @@ public void testSaveFirstRecord() throws Exception { @@
                             null,
                             null,
                             null,
+                            null,
                             null),
                     version
                     );
@@ Expand Down @@
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,6 +125,7 @@ public void testRegister() throws Exception { @@
                             null,
                             null,
                             null,
+                            null,
                             null
                     )
             );
@@ Expand All @@
                             null,
                             null,
                             null,
+                            null,
                             null
                     )
             );
@@ Expand All / @@ -164,6 +166,7 @@ public void testRegisterInvalidNodeId() throws Exception { @@
                             null,
                             null,
                             null,
+                            null,
                             null
                     )
             );
@@ Expand Down Expand Up @@
                             null,
                             null,
                             null,
+                            null,
                             null
                     )
             );
@@ Expand Down @@