You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2025/01/21 13:11:09 UTC
(brooklyn-docs) branch master updated (6a1a0bb5 -> fd086ebb)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
from 6a1a0bb5 Merge pull request #388 from niallkp/master
new fc8772e8 logback/fluentd tweak for thread names
new fd086ebb docs for new ldap recursive search feature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
guide/ops/configuration/brooklyn_cfg.md | 17 +++++++++++------
guide/ops/logging/logbook.md | 7 +++++--
2 files changed, 16 insertions(+), 8 deletions(-)
(brooklyn-docs) 01/02: logback/fluentd tweak for thread names
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit fc8772e80501dc9c8021e2bd028e5df2206904ad
Author: Alex Heneveld <gi...@alex.heneveld.org>
AuthorDate: Mon Jan 20 14:02:48 2025 +0000
logback/fluentd tweak for thread names
---
guide/ops/logging/logbook.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/guide/ops/logging/logbook.md b/guide/ops/logging/logbook.md
index 1b0ab73f..532059c8 100644
--- a/guide/ops/logging/logbook.md
+++ b/guide/ops/logging/logbook.md
@@ -64,7 +64,7 @@ is a good simple way to forward content added to the info and debug log files:
<parse>
@type multiline
format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
- format1 /^(?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z) (?<taskId>\S+)?-(?<entityIds>\S+)? (?<level>\w{4} |\w{5})\W{1,4}(?<bundleId>\d{1,3}) (?<class>(?:\S\.)*\S*) \[(?<threadName>\S+)\] (?<message>.*)/
+ format1 /^(?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z) (?<taskId>\S+)?-(?<entityIds>\S+)? (?<level>\w{4} |\w{5})\W{1,4}(?<bundleId>\d{1,3}) (?<class>(?:\S\.)*\S*) ([(?<threadName>[^\]]*)\] )?(?<message>.*)/
time_format %Y-%m-%dT%H:%M:%S,%L
</parse>
path /var/logs/brooklyn/brooklyn.info.log
@@ -79,7 +79,7 @@ is a good simple way to forward content added to the info and debug log files:
<parse>
@type multiline
format_firstline /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/
- format1 /^(?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z) (?<taskId>\S+)?-(?<entityIds>\S+)? (?<level>\w{4} |\w{5})\W{1,4}(?<bundleId>\d{1,3}) (?<class>(?:\S\.)*\S*) \[(?<threadName>\S+)\] (?<message>.*)/
+ format1 /^(?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z) (?<taskId>\S+)?-(?<entityIds>\S+)? (?<level>\w{4} |\w{5})\W{1,4}(?<bundleId>\d{1,3}) (?<class>(?:\S\.)*\S*) ([(?<threadName>[^\]]*)\] )?(?<message>.*)/
time_format %Y-%m-%dT%H:%M:%S,%L
</parse>
path /var/logs/brooklyn/brooklyn.debug.log
@@ -103,9 +103,12 @@ is a good simple way to forward content added to the info and debug log files:
</match>
```
+The `format1` line assumes the standard log format which ships with Apache Brooklyn, and that thread names do not contain `]`;
+if this is not the case the configuration here and/or in logback can be configured differently for your environment.
The filter block is needed for only picking up the `debug` log level from the debug source, as the `info` and upper
levels are already present in the info file.
+
### Sizing and Rotating Logs
Keeping log data obviously consumes disk storage, and serving the data requires memory.
(brooklyn-docs) 02/02: docs for new ldap recursive search feature
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit fd086ebb8d9c303e6275eea99554845143b05909
Author: Alex Heneveld <gi...@alex.heneveld.org>
AuthorDate: Mon Jan 20 17:41:12 2025 +0000
docs for new ldap recursive search feature
---
guide/ops/configuration/brooklyn_cfg.md | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/guide/ops/configuration/brooklyn_cfg.md b/guide/ops/configuration/brooklyn_cfg.md
index 0000af1f..30a799ba 100644
--- a/guide/ops/configuration/brooklyn_cfg.md
+++ b/guide/ops/configuration/brooklyn_cfg.md
@@ -145,15 +145,20 @@ The other things you need to set in `brooklyn.cfg` are:
* `brooklyn.webconsole.security.ldap.realm` - ldap dc parameter (domain)
* `brooklyn.webconsole.security.ldap.allowed_realms_regex` - allows multiple realms (domains) that match regex - username must
be of form domain\user
-* `brooklyn.webconsole.security.ldap.ou` *optional, by default it set to Users* - ldap ou parameter
-* `brooklyn.webconsole.security.ldap.group_config_key` *optional* to be used in combination with the next. Name of the
- config key prefix for the valid LDAP groups to be mapped to AMP entitlements. If used only mapped groups will be added
+* `brooklyn.webconsole.security.ldap.ou` *optional, by default Users* - ldap ou parameter or comma separated ou=... values
+* `brooklyn.webconsole.security.ldap.group_config_key` *optional* to be used in combination with user group fetches (the next setting).
+ Name of the config key prefix for the valid LDAP groups to be mapped to AMP entitlements. If used only mapped groups will be added
to the user groups. If empty, user LDAP groups will be ignored.
-* `brooklyn.webconsole.security.ldap.fetch_user_group` *optional, by default it set to false* - whether or not the LDAP
+* `brooklyn.webconsole.security.ldap.fetch_user_group` *optional, by default false* - whether or not the LDAP
groups for the user should be gathered. If true, the groups will be stored in the user session and the security context
-* `brooklyn.webconsole.security.ldap.login_info_log` *optional, by default it set to false* - whether or not the user attempts
+* `brooklyn.webconsole.security.ldap.login_info_log` *optional, by default false* - whether or not the user attempts
to log in the system must be added to the info log
- **brooklyn.cfg example configuration:**
+* `brooklyn.webconsole.security.ldap.recursive` *optional, by default false* - whether searches for users and groups should be recursive
+* `brooklyn.webconsole.security.ldap.group_filter` *optional* - a search expression using {0} as the principal (prospective user) to match to find groups, {0}, e.g. `(&(member:1.2.840.113556.1.4.1941:={0})(objectClass=group))`
+* `brooklyn.webconsole.security.ldap.group_ou=02-Groups,OU=DOMAIN` *optional; required if using group_filter* - a filter for the groups returned by the group_filter
+
+
+**brooklyn.cfg example configuration:**
~~~
brooklyn.webconsole.security.provider=org.apache.brooklyn.rest.security.provider.LdapSecurityProvider