Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support tags for automatic sidecar configuration #13367

Merged
merged 3 commits into from
Sep 8, 2022
Merged

Support tags for automatic sidecar configuration #13367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9de258a
Add "tags" field to DTOs
thll Aug 29, 2022
cf93b9e
Merge remote-tracking branch 'origin/master' into sidecar-tags
thll Sep 7, 2022
3140514
Merge branch 'master' into sidecar-tags
thll Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions graylog2-server/src/main/java/org/graylog/plugins/sidecar/rest/models/NodeDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,17 @@ public abstract class NodeDetails {
@Nullable
public abstract CollectorStatusList statusList();

@JsonProperty("tags")
@Nullable
public abstract List<String> tags();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be a Set to prevent duplicates?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't hurt yeah. can I fix this in a separate PR? I'm waiting for this one to be merged


@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);
}
}
9 changes: 6 additions & 3 deletions graylog2-server/src/main/java/org/graylog/plugins/sidecar/services/SidecarService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
Expand All @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions ...2-server/src/test/java/org/graylog/plugins/sidecar/collectors/SidecarServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public void testSaveFirstRecord() throws Exception {
null,
null,
null,
null,
null),
version
);
Expand Down
4 changes: 4 additions & 0 deletions ...server/src/test/java/org/graylog/plugins/sidecar/collectors/rest/SidecarResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public void testRegister() throws Exception {
null,
null,
null,
null,
null
)
);
Expand All @@ -144,6 +145,7 @@ public void testRegisterInvalidCollectorId() throws Exception {
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 @@ -198,6 +201,7 @@ public void testRegisterMissingOperatingSystem() throws Exception {
null,
null,
null,
null,
null
)
);
Expand Down