Skip to content

Commit 7a6fa03

Browse files
committed
merge master
2 parents 8cf8130 + 994cc85 commit 7a6fa03

File tree

275 files changed

+2438
-2471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+2438
-2471
lines changed

UPGRADING.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
Upgrading to Graylog 7.1.x
22
==========================
33

4+
## User Session Termination
5+
46
All user sessions will be terminated when upgrading because the internal storage format for sessions has been changed.
57
Users will have to log in again.
68

79
## Breaking Changes
810

9-
tbd
11+
### External Authentication Services: Changed Default User Time Zone
12+
13+
The authentication backends for Active Directory, LDAP, OIDC, Okta, and SAML previously set the time zone for
14+
newly synchronized users to the value of the `root_timezone` config file setting. ("UTC" by default)
15+
16+
Graylog 7.1 introduces a configurable "default user time zone" setting for all authentication backends.
17+
The default value is unset, meaning that the browser's time zone will be used by default.
1018

1119
## Configuration File Changes
1220

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
type = "a"
22
message = "Cloud Trail input improvements: Added setup wizard, improved processing, and support for automatic authentication."
33

4-
issues = ["11664"]
4+
pulls = ["23711", "24355"]
5+
issues = ["graylog-plugin-enterprise#11664", "graylog-plugin-enterprise#12591"]

changelog/unreleased/issue-12248.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ type = "a"
22
message = "Improved Inputs Overview Page: The page has been revamped with pagination and various UI enhancements to improve navigation."
33

44
pulls = ["24245", "Graylog2/graylog-plugin-enterprise#12538"]
5-
issues = ["12248"]
5+
issues = ["12248", "graylog-plugin-enterprise#24421"]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type = "fixed"
2+
message = "Fix issue when click on pie chart shows in popover NaN instead of value."
3+
4+
issues = ["23853"]
5+
pulls = ["24413"]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type = "f"
2+
message = "Fix an issue where clicking on the checkbox title doesn't change the checkbox state in aggregation widget edit form."
3+
4+
pulls = ["24386"]
5+
issues = ["24385"]

changelog/unreleased/pr-24308.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type = "added" # One of: a(dded), c(hanged), d(eprecated), r(emoved), f(ixed), s(ecurity)
2+
message = "Add option in MCP config for disabling schema output in responses."
3+
4+
issues = ["23980"]
5+
pulls = ["24308"]

changelog/unreleased/pr-24381.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
type = "c"
2+
message = "Add auth service config setting for user's default time zone. (see upgrade notes)"
3+
4+
pulls = ["24381", "graylog-plugin-enterprise#12641"]

changelog/unreleased/pr-24424.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type = "c"
2+
message = "JadConfig updated to 1.0.0, adapted paths validation"
3+
4+
issues = []
5+
pulls = ["24424", "Graylog2/graylog-plugin-enterprise#12679"]

changelog/unreleased/pr-24441.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
type = "a"
2+
message = "Make maximum event age of cluster events configurable. "
3+
4+
pulls = ["24441"]

data-node/src/test/java/org/graylog/datanode/DatanodeTestUtils.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,43 @@
2020
import com.github.joschi.jadconfig.RepositoryException;
2121
import com.github.joschi.jadconfig.ValidationException;
2222
import com.github.joschi.jadconfig.repositories.InMemoryRepository;
23+
import jakarta.annotation.Nonnull;
2324
import org.apache.commons.lang3.RandomStringUtils;
2425
import org.graylog.datanode.configuration.DatanodeDirectories;
2526
import org.graylog.security.certutil.CertRequest;
2627
import org.graylog.security.certutil.CertificateGenerator;
2728
import org.graylog.security.certutil.KeyPair;
2829

30+
import java.io.IOException;
31+
import java.nio.file.Files;
2932
import java.nio.file.Path;
3033
import java.time.Duration;
3134
import java.util.List;
3235
import java.util.Map;
3336

3437
public class DatanodeTestUtils {
35-
public static Configuration datanodeConfiguration(Map<String, String> properties) throws RepositoryException, ValidationException {
38+
public static Configuration datanodeConfiguration(Map<String, String> properties, Path tempDir) throws RepositoryException, ValidationException {
3639
final Configuration configuration = new Configuration();
3740
final InMemoryRepository mandatoryProps = new InMemoryRepository(Map.of(
38-
"password_secret", "thisisverysecretpassword"
41+
"password_secret", "thisisverysecretpassword",
42+
"opensearch_logs_location", createDir(tempDir, "opensearch_logs"),
43+
"opensearch_config_location", createDir(tempDir, "opensearch_config"),
44+
"opensearch_data_location", createDir(tempDir, "opensearch_data"),
45+
"node_id_file", tempDir.resolve("node_id").toAbsolutePath().toString()
3946
));
4047
new JadConfig(List.of(mandatoryProps, new InMemoryRepository(properties)), configuration).process();
4148
return configuration;
4249
}
4350

51+
@Nonnull
52+
private static String createDir(Path tempDir, String dir) {
53+
try {
54+
return Files.createDirectory(tempDir.resolve(dir)).toAbsolutePath().toString();
55+
} catch (IOException e) {
56+
throw new RuntimeException(e);
57+
}
58+
}
59+
4460
public static DatanodeDirectories tempDirectories(Path tempDir) {
4561
return new DatanodeDirectories(tempDir, tempDir, tempDir, tempDir);
4662
}

0 commit comments

Comments
 (0)