diff --git a/.github/workflows/docs-deploy-surge.yml b/.github/workflows/docs-deploy-surge.yml index 2399928e4..0356da7d7 100644 --- a/.github/workflows/docs-deploy-surge.yml +++ b/.github/workflows/docs-deploy-surge.yml @@ -17,7 +17,7 @@ on: - completed jobs: - publish-docs: + deploy-docs: # Uncomment this if statement to deploy only when the PR builds cleanly # if: github.event.workflow_run.conclusion == 'success' @@ -63,11 +63,6 @@ jobs: - id: unzip-docs run: unzip docs.zip - - id: get-top-dir - run: | - root=$(ls -d */index.html | sed -r 's/(.*)\/index\.html/\1/') - echo "top-dir=$root" >> $GITHUB_OUTPUT - - id: unzip-changelog if: ${{ hashFiles('changelog.zip') != '' }} run: unzip changelog.zip @@ -99,13 +94,13 @@ jobs: SITE_DIR: ${{ steps.get-top-dir.outputs.top-dir }} run: | npm install -g surge - surge ./$SITE_DIR $DEPLOY_URL --token "$SURGE_TOKEN" + surge . $DEPLOY_URL --token "$SURGE_TOKEN" # If the PR artifacts include a changelog file, add it to the PR as a comment # The changelog contains links to new and changed files in the deployed docs - name: Comment on PR (changelog) if: ${{ hashFiles('changelog') != '' }} - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 #v2.9.0 + uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 #v2 with: number: ${{ steps.get-deploy-id.outputs.deploy-id }} recreate: true @@ -118,7 +113,7 @@ jobs: if: ${{ hashFiles('changelog') == '' }} env: DEPLOY_URL: ${{ steps.get-deploy-url.outputs.deploy-url }} - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 #v2.9.0 + uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 #v2 with: number: ${{ steps.get-deploy-id.outputs.deploy-id }} header: docs-pr-changes diff --git a/antora.yml b/antora.yml index 062fbe766..1b578d36d 100644 --- a/antora.yml +++ b/antora.yml @@ -1,14 +1,14 @@ name: operations-manual title: Operations Manual -version: '2025.09' +version: '2025.10' current: true start_page: ROOT:index.adoc nav: - modules/ROOT/content-nav.adoc asciidoc: attributes: - neo4j-version: '2025.09' - neo4j-version-minor: '2025.09' - neo4j-version-exact: '2025.09.0' - neo4j-buildnumber: '2025.09' - neo4j-debian-package-version: '1:2025.09.0@' + neo4j-version: '2025.10' + neo4j-version-minor: '2025.10' + neo4j-version-exact: '2025.10.1' + neo4j-buildnumber: '2025.10' + neo4j-debian-package-version: '1:2025.10.1@' diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc index 649c9410d..5b768f600 100644 --- a/modules/ROOT/content-nav.adoc +++ b/modules/ROOT/content-nav.adoc @@ -130,25 +130,8 @@ *** xref:database-administration/aliases/manage-aliases-standard-databases.adoc[] *** xref:database-administration/aliases/manage-aliases-composite-databases.adoc[] *** xref:database-administration/aliases/remote-database-alias-configuration.adoc[] -** Composite databases -*** xref:database-administration/composite-databases/concepts.adoc[] -*** xref:database-administration/composite-databases/create-composite-databases.adoc[] -*** xref:database-administration/composite-databases/list-composite-databases.adoc[] -*** xref:database-administration/composite-databases/alter-composite-databases.adoc[] -*** xref:database-administration/composite-databases/start-stop-composite-databases.adoc[] -*** xref:database-administration/composite-databases/delete-composite-databases.adoc[] -*** xref:database-administration/composite-databases/querying-composite-databases.adoc[] -*** xref:database-administration/composite-databases/sharding-with-copy.adoc[] ** xref:database-administration/routing-decisions.adoc[] -* xref:database-internals/index.adoc[] -** xref:database-internals/transaction-management.adoc[] -** xref:database-internals/concurrent-data-access.adoc[] -** xref:database-internals/transaction-logs.adoc[] -** xref:database-internals/checkpointing.adoc[] -** xref:database-internals/store-formats.adoc[] -** xref:database-internals/neo4j-admin-store-info.adoc[] - * xref:clustering/index.adoc[] ** xref:clustering/introduction.adoc[] ** Setting up a cluster @@ -177,6 +160,41 @@ ** xref:clustering/server-syntax.adoc[] ** xref:clustering/glossary.adoc[] +* Scalability +** xref:scalability/concepts.adoc[] +** xref:scalability/scaling-with-neo4j.adoc[] +** Composite databases +*** xref:scalability/composite-databases/concepts.adoc[] +*** xref:scalability/composite-databases/create-composite-databases.adoc[] +*** xref:scalability/composite-databases/list-composite-databases.adoc[] +*** xref:scalability/composite-databases/alter-composite-databases.adoc[] +*** xref:scalability/composite-databases/start-stop-composite-databases.adoc[] +*** xref:scalability/composite-databases/delete-composite-databases.adoc[] +*** xref:scalability/composite-databases/querying-composite-databases.adoc[] +*** xref:scalability/composite-databases/sharding-with-copy.adoc[] +//*** xref:scalability/composite-databases/scaling-with-composite-databases.adoc[] +** Property sharding (Preview feature) +*** xref:scalability/sharded-property-databases/overview.adoc[] +*** xref:scalability/sharded-property-databases/planning-and-sizing.adoc[] +*** xref:scalability/sharded-property-databases/configuration.adoc[] +*** xref:scalability/sharded-property-databases/data-ingestion.adoc[] +*** xref:scalability/sharded-property-databases/starting-stopping-sharded-databases.adoc[] +*** xref:scalability/sharded-property-databases/listing-sharded-databases.adoc[] +*** xref:scalability/sharded-property-databases/altering-sharded-databases.adoc[] +*** xref:scalability/sharded-property-databases/deleting-sharded-databases.adoc[] +*** xref:scalability/sharded-property-databases/role-based-access-control.adoc[] +*** xref:scalability/sharded-property-databases/admin-operations.adoc[] +*** xref:scalability/sharded-property-databases/security.adoc[] +*** xref:scalability/sharded-property-databases/limitations-and-considerations.adoc[] + +* xref:database-internals/index.adoc[] +** xref:database-internals/transaction-management.adoc[] +** xref:database-internals/concurrent-data-access.adoc[] +** xref:database-internals/transaction-logs.adoc[] +** xref:database-internals/checkpointing.adoc[] +** xref:database-internals/store-formats.adoc[] +** xref:database-internals/neo4j-admin-store-info.adoc[] + * xref:backup-restore/index.adoc[] ** xref:backup-restore/planning.adoc[] ** xref:backup-restore/modes.adoc[] diff --git a/modules/ROOT/images/scalability/horizontal-scaling-strategies.svg b/modules/ROOT/images/scalability/horizontal-scaling-strategies.svg new file mode 100644 index 000000000..47bfdd1d3 --- /dev/null +++ b/modules/ROOT/images/scalability/horizontal-scaling-strategies.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/ROOT/images/scalability/property-shard-deployment.svg b/modules/ROOT/images/scalability/property-shard-deployment.svg new file mode 100644 index 000000000..f451d46df --- /dev/null +++ b/modules/ROOT/images/scalability/property-shard-deployment.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/ROOT/images/scalability/sharded-architecture.svg b/modules/ROOT/images/scalability/sharded-architecture.svg new file mode 100644 index 000000000..9475c840d --- /dev/null +++ b/modules/ROOT/images/scalability/sharded-architecture.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/ROOT/pages/backup-restore/consistency-checker.adoc b/modules/ROOT/pages/backup-restore/consistency-checker.adoc index 9a0983db7..5a5cc86fb 100644 --- a/modules/ROOT/pages/backup-restore/consistency-checker.adoc +++ b/modules/ROOT/pages/backup-restore/consistency-checker.adoc @@ -141,7 +141,7 @@ The following are examples of how to check the consistency of a database, a dump [NOTE] ==== -`neo4j-admin database check` cannot be applied to xref:database-administration/composite-databases/concepts.adoc[Composite databases]. +`neo4j-admin database check` cannot be applied to xref:scalability/composite-databases/concepts.adoc[Composite databases]. It must be run directly on the databases that are associated with that Composite database. ==== @@ -208,7 +208,6 @@ The backup chain must be aggregated into a full recovered backup artifact before See xref:backup-restore/aggregate.adoc[] for more details. ==== - Run with the `--from-path` option to check the consistency of a backup or a dump. + Starting with Neo4j 2025.09, the option accepts a path to a specific backup or dump file you want to be checked for consistency. If only the directory is provided, the most recent backup chain (based on transaction IDs) within that directory will be checked. diff --git a/modules/ROOT/pages/backup-restore/copy-database.adoc b/modules/ROOT/pages/backup-restore/copy-database.adoc index 3d17183db..7d788ec61 100644 --- a/modules/ROOT/pages/backup-restore/copy-database.adoc +++ b/modules/ROOT/pages/backup-restore/copy-database.adoc @@ -11,7 +11,7 @@ You can use the `neo4j-admin database copy` command to copy a database, create a ==== * `neo4j-admin database copy` preserves the node IDs (unless `--compact-node-store` is used), but the relationships get new IDs. * `neo4j-admin database copy` is not supported for use on the `system` database. -* `neo4j-admin database copy` is not supported for use on xref:database-administration/composite-databases/concepts.adoc[Composite databases]. +* `neo4j-admin database copy` is not supported for use on xref:scalability/composite-databases/concepts.adoc[Composite databases]. It must be run directly on the databases that are associated with that Composite database. * `neo4j-admin database copy` is an IOPS-intensive process. For more information, see <>. @@ -300,7 +300,7 @@ Labels are processed independently, i.e., the filter ignores any node with a lab [TIP] ==== -For a detailed example of how to use `neo4j-admin database copy` to filter out data for sharding a database, see xref:database-administration/composite-databases/sharding-with-copy.adoc[Sharding data with the `copy` command]. +For a detailed example of how to use `neo4j-admin database copy` to filter out data for sharding a database, see xref:scalability/composite-databases/sharding-with-copy.adoc[Sharding data with the `copy` command]. ==== [[compact-database]] diff --git a/modules/ROOT/pages/backup-restore/offline-backup.adoc b/modules/ROOT/pages/backup-restore/offline-backup.adoc index 238438007..79805efed 100644 --- a/modules/ROOT/pages/backup-restore/offline-backup.adoc +++ b/modules/ROOT/pages/backup-restore/offline-backup.adoc @@ -109,7 +109,7 @@ The command creates a file called _database.dump_ where `database` is the databa [NOTE] ==== -`neo4j-admin database dump` cannot be applied to xref:database-administration/composite-databases/concepts.adoc[Composite databases]. +`neo4j-admin database dump` cannot be applied to xref:scalability/composite-databases/concepts.adoc[Composite databases]. It must be run directly on the databases that are associated with that Composite database. ==== diff --git a/modules/ROOT/pages/backup-restore/online-backup.adoc b/modules/ROOT/pages/backup-restore/online-backup.adoc index 995d65cc7..67c6445d8 100644 --- a/modules/ROOT/pages/backup-restore/online-backup.adoc +++ b/modules/ROOT/pages/backup-restore/online-backup.adoc @@ -64,13 +64,11 @@ For more information, see xref:backup-restore/online-backup.adoc#online-backup-c [source,role=noheader] ---- -neo4j-admin database backup [-h] [--expand-commands] [--prefer-diff-as-parent] [--verbose] - [--compress[=true|false]] [--keep-failed[=true|false]] - [--parallel-recovery[=true|false]] [--remote-address-resolution - [=true|false]] [--additional-config=] - [--include-metadata=none|all|users|roles] [--inspect-path=] - [--pagecache=] [--temp-path=] [--to-path=] - [--type=] [--from=[,...]]... [...] +neo4j-admin database backup [-h] [--expand-commands] [--prefer-diff-as-parent] [--verbose] [--compress[=true|false]] + [--keep-failed[=true|false]] [--parallel-recovery[=true|false]] [--remote-address-resolution + [=true|false]] [--additional-config=] [--include-metadata=none|all|users[=user1,user2] + |roles] [--inspect-path=] [--pagecache=] [--temp-path=] + [--to-path=] [--type=] [--from=[,...]]... [...] ---- === Description @@ -128,11 +126,11 @@ If is "*", `neo4j-admin` will attempt to back up all databases of the |Show this help message and exit. | -|--include-metadata=none\|all\|users\|roles -|Include metadata in the file. This cannot be used for backing up the `system` database. Possible values are: +|--include-metadata=none\|all\|users[=user1,user2]\|roles +|label:new[Changed in 2025.10] Include metadata in the file. This cannot be used for backing up the `system` database. Possible values are: - `roles` - include commands to create the roles and privileges (for both database and graph) that affect the use of the database. -- `users` - include commands to create the users that can use the database and their role assignments. +- `users` - include commands to create the users that can use the database and their role assignments. If a list of users is specified (e.g. `users=alice,bob,charlie`), only those users are included in the backup. - `all` - include both `roles` and `users`. - `none` - does not include any metadata. [NOTE] diff --git a/modules/ROOT/pages/backup-restore/planning.adoc b/modules/ROOT/pages/backup-restore/planning.adoc index bb05e236b..f801fd242 100644 --- a/modules/ROOT/pages/backup-restore/planning.adoc +++ b/modules/ROOT/pages/backup-restore/planning.adoc @@ -172,7 +172,7 @@ The following table summarizes the commands' capabilities and usage. [NOTE] ==== -The Neo4j Admin commands `backup`, `restore`, `dump`, `load`, `copy`, and `check-consistency` are not supported for use on xref:database-administration/composite-databases/concepts.adoc[Composite databases]. +The Neo4j Admin commands `backup`, `restore`, `dump`, `load`, `copy`, and `check-consistency` are not supported for use on xref:scalability/composite-databases/concepts.adoc[Composite databases]. They must be run directly on the databases that are associated with that Composite database. ==== @@ -196,7 +196,7 @@ By default, a database backup includes only the database contents. If you choose to include metadata, the backup also stores the role-based access control (RBAC) settings associated with the database. When restoring, you have the flexibility to define the target topology (how many primaries and secondaries are desired for the database), which may differ from the topology at backup time. -The database will then be allocated across the available servers according to that topology. +The database will then be allocated across the available servers according to that topology. ==== [[backup-planning-databases]] diff --git a/modules/ROOT/pages/backup-restore/restore-dump.adoc b/modules/ROOT/pages/backup-restore/restore-dump.adoc index 1677b7dcd..30f0957d7 100644 --- a/modules/ROOT/pages/backup-restore/restore-dump.adoc +++ b/modules/ROOT/pages/backup-restore/restore-dump.adoc @@ -117,7 +117,7 @@ For more information, see xref:clustering/databases.adoc#cluster-seed[Seed a clu [NOTE] ==== -`neo4j-admin database load` cannot be applied to xref:database-administration/composite-databases/concepts.adoc[Composite databases]. +`neo4j-admin database load` cannot be applied to xref:scalability/composite-databases/concepts.adoc[Composite databases]. It must be run directly on the databases that are associated with that Composite database. ==== diff --git a/modules/ROOT/pages/changes-deprecations-removals.adoc b/modules/ROOT/pages/changes-deprecations-removals.adoc index 678d11996..c5a5f733e 100644 --- a/modules/ROOT/pages/changes-deprecations-removals.adoc +++ b/modules/ROOT/pages/changes-deprecations-removals.adoc @@ -375,6 +375,19 @@ This section lists all the Neo4j Server features deprecated in the 2025 series, For deprecations in Cypher language, see link:{neo4j-docs-base-uri}/cypher-manual/current/deprecations-additions-removals-compatibility/[Cypher manual -> Deprecations, additions, and compatibility]. +=== Operating systems + +The following operating systems are deprecated as of Neo4j 2025.10: + +* Red Hat Enterprise Linux 8.x +* Debian 11.x +* Windows Server 2022 +* MacOS 13 Ventura +* MacOS 14 Sonoma + +These operating systems will continue to be supported along with the next LTS release in 2026, but new releases after the 2026 LTS will no longer support these platforms. +It is recommended to upgrade to a supported OS version before the next LTS release. + === Procedures .See all deprecated procedures @@ -598,9 +611,19 @@ The section covers changes to Neo4j server functionality across different areas. === Neo4j-admin tool +Neo4j 2025.10:: + +* label:enterprise[Enterprise Edition] The `neo4j-admin database backup` command. ++ +The `--include-metadata=none|all|users[=user1,user2]|roles` option is changed. +Now it allows filtering users when performing a database backup. + +Previously, if you specified `users` with `--include-metadata`, the backup file would include commands to create the users that can use the database and their role assignments. +Starting from 2025.10, you can define a list of specific users (e.g., `users=alice,bob,charlie`), which means only those users are included in the backup. +For details, refer to xref:backup-restore/online-backup.adoc[]. + Neo4j 2025.01:: -* The `neo4j-admin database copy` command. +* label:enterprise[Enterprise Edition] The `neo4j-admin database copy` command. + The functionality of the `--from-pagecache=` option is changed. + Instead of specifying how much cache to allocate when reading the source, now you can control the maximum amount of off-heap memory used for the copy operation, both for reading and writing. @@ -650,3 +673,18 @@ The included *neo4j.count* metrics class replaces the deprecated *ids_in_use* me + For more information, see xref:monitoring/metrics/reference.adoc#db-data-count-metrics[Monitoring -> Metrics reference] and the tables _Database data count metrics_ and _Database data metrics_ respectively. + +[[ssl-framework-changes]] +=== SSL framework + +Neo4j 2025.10:: + +As of 2025.10, the Java 21 default cipher suites that use insecure CBC-based ciphers are removed from Neo4j: + +* TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 +* TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 +* TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 +* TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 ++ +However, you still can use them by explicitly specifying their configuration and referencing them in your setup. + diff --git a/modules/ROOT/pages/configuration/configuration-settings.adoc b/modules/ROOT/pages/configuration/configuration-settings.adoc index a1d7c8618..ed08b5eb0 100644 --- a/modules/ROOT/pages/configuration/configuration-settings.adoc +++ b/modules/ROOT/pages/configuration/configuration-settings.adoc @@ -8,7 +8,7 @@ Refer to xref:configuration/neo4j-conf.adoc#_configuration_settings[The neo4j.co For lists of deprecated and removed configuration settings in 2025.x, refer to the page xref:changes-deprecations-removals.adoc[Changes, deprecations, and removals in Neo4j 2025.x]. -To list all available configuration settings on a Neo4j server, run the link:https://neo4j.com/docs/cypher-manual/5/clauses/listing-settings[`SHOW SETTINGS`] command. +To list all available configuration settings on a Neo4j server, run the link:{neo4j-docs-base-uri}/cypher-manual/5/clauses/listing-settings[`SHOW SETTINGS`] command. == Dynamic configuration settings @@ -3314,6 +3314,19 @@ The default value of the `server.metrics.filter` was changed in Neo4j 2025.03 an For details, refer to the xref:changes-deprecations-removals.adoc#_configuration_settings_2[Changes, deprecations, and removals in Neo4j 2025.x]. ==== +[role=label--enterprise-edition label--new-2025.10] +[[config_server.metrics.deny_filter]] +=== `server.metrics.deny_filter` +.server.metrics.deny_filter +[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"] +|=== +|Description +a|Specifies which metrics should be disabled by using a comma-separated list of globbing patterns. Overrides the enabled metrics of `server.metrics.filter`. For example, if `server.metrics.filter` contains `neo4j.page_cache.*` and `server.metrics.deny_filter` contains `neo4j.page_cache.page_faults`, it will enable all pagecache metrics, except the `neo4j.page_cache.page_faults` metric. +|Valid values +a|A comma-separated list where each element is A simple globbing pattern that can use `*` and `?`.. +|Default value +m|++++++ +|=== [role=label--enterprise-edition] [[config_server.metrics.graphite.enabled]] @@ -4703,6 +4716,20 @@ a|A boolean. m|+++false+++ |=== +[role=label--enterprise-edition label--new-2025.10] +[[config_dbms.security.allow_oidc_credential_forwarding_enabled]] +=== `dbms.security.allow_oidc_credential_forwarding_enabled` + +.dbms.security.allow_oidc_credential_forwarding_enabled +[frame="topbot", stripes=odd, grid="cols", cols="<1s,<4"] +|=== +|Description +a|When set to `true`, remote database aliases are allowed to forward OIDC credentials to authenticate on remote Neo4j DBMS. When set to `false`, OIDC credentials are not allowed to be forwarded to remote DBMS. Existing aliases that rely on this method remain defined but cannot be used to connect until this setting is enabled. +|Valid values +a|A boolean. +|Default value +m|+++false+++ +|=== [[config_dbms.netty.ssl.provider]] === `dbms.netty.ssl.provider` diff --git a/modules/ROOT/pages/configuration/plugins.adoc b/modules/ROOT/pages/configuration/plugins.adoc index 9e89e657f..d25787380 100644 --- a/modules/ROOT/pages/configuration/plugins.adoc +++ b/modules/ROOT/pages/configuration/plugins.adoc @@ -150,7 +150,7 @@ For more information on configuring the plugins, see the respective documentatio * link:https://neo4j.com/docs/bloom-user-guide/current/bloom-installation/[Bloom documentation] * link:https://neo4j.com/docs/aura/fleet-management/setup/[Fleet management documentation] * link:https://neo4j.com/docs/graph-data-science/current/installation/neo4j-server/[GDS documentation] -* link:https://neo4j.com/docs/cypher-manual/current/genai-integrations/[GenAI documentation] +* link:{neo4j-docs-base-uri}/cypher-manual/current/genai-integrations/[GenAI documentation] * link:https://neo4j.com/labs/neosemantics/[Neosemantics documentation] . Restart Neo4j for the plugins to be loaded and available for use. diff --git a/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc b/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc index c7277e2b7..203e01e38 100644 --- a/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc +++ b/modules/ROOT/pages/database-administration/aliases/manage-aliases-composite-databases.adoc @@ -56,7 +56,7 @@ For a description of all the returned columns of this command, and for ways in w [[create-composite-database-alias]] == Create database aliases in composite databases -Both local and remote database aliases can be part of a xref::database-administration/composite-databases/concepts.adoc[composite database]. +Both local and remote database aliases can be part of a xref::scalability/composite-databases/concepts.adoc[composite database]. The database alias consists of two parts, separated by a dot: the namespace and the alias name. diff --git a/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc b/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc index 26d834412..898846c3b 100644 --- a/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc +++ b/modules/ROOT/pages/database-administration/aliases/manage-aliases-standard-databases.adoc @@ -44,7 +44,7 @@ The home database for users can be set to an alias, which will be resolved to th Starting with Neo4j 2025.04, a database alias can also be set as the DBMS default database. This page describes managing database aliases for standard databases. -For aliases created as part of a xref:database-administration/composite-databases/concepts.adoc[composite database], see xref:database-administration/aliases/manage-aliases-composite-databases.adoc[]. +For aliases created as part of a xref:scalability/composite-databases/concepts.adoc[composite database], see xref:database-administration/aliases/manage-aliases-composite-databases.adoc[]. [[manage-aliases-list]] == List database aliases @@ -114,7 +114,7 @@ If a user has not been granted the `ACCESS` privilege to the target database and | STRING | user -| User connecting to the remote database or `null` if the target database is local. label:default-output[] +| Native user connecting to the remote database, or `null` if the target database is local or OIDC credential forwarding is used to authenticate against the remote database. label:default-output[] | STRING | driver diff --git a/modules/ROOT/pages/database-administration/index.adoc b/modules/ROOT/pages/database-administration/index.adoc index d36b16ecd..78dc0335e 100644 --- a/modules/ROOT/pages/database-administration/index.adoc +++ b/modules/ROOT/pages/database-administration/index.adoc @@ -83,10 +83,10 @@ image::manage-dbs-community.svg[title="A default Neo4j installation.",role=popup .An installation of Neo4j with multiple active databases, named `marketing`, `sales`, and `hr`: image::manage-dbs-enterprise.svg[title="A multiple database Neo4j installation.",role=popup] -For details about the `system` database in a clustered environment, refer to xref:clustering/databases.adoc#cluster-system-db[Managing databases in a cluster -> The `system` database]. +For details about the `system` database in a clustered environment, refer to xref:clustering/databases.adoc#cluster-system-db[Managing databases in a cluster -> The `system` database]. == Composite databases A Composite database is a logical grouping of multiple graphs contained in other, standard databases. A Composite database defines an _execution context_ and a (limited) _transaction domain_. -For more information, see xref:database-administration/composite-databases/concepts.adoc[Composite databases]. \ No newline at end of file +For more information, see xref:scalability/composite-databases/concepts.adoc[Composite databases]. \ No newline at end of file diff --git a/modules/ROOT/pages/database-administration/routing-decisions.adoc b/modules/ROOT/pages/database-administration/routing-decisions.adoc index 12cbd590c..608ef97d2 100644 --- a/modules/ROOT/pages/database-administration/routing-decisions.adoc +++ b/modules/ROOT/pages/database-administration/routing-decisions.adoc @@ -21,7 +21,7 @@ Step 2: Reuse open transaction:: * If not, then proceed to step 3. Step 3: Determine the type of the target database (execution context type):: * If the target database is a database in this DBMS, then the context type is _Internal_. -* If the target database is a xref::database-administration/composite-databases/concepts.adoc[Composite database], then the context type is _Composite_. + +* If the target database is a xref::scalability/composite-databases/concepts.adoc[Composite database], then the context type is _Composite_. + + [NOTE] ==== diff --git a/modules/ROOT/pages/import.adoc b/modules/ROOT/pages/import.adoc index f3018c25e..f4a8175d8 100644 --- a/modules/ROOT/pages/import.adoc +++ b/modules/ROOT/pages/import.adoc @@ -84,20 +84,24 @@ The syntax for importing a set of CSV files is: [source, syntax, role="nocopy"] ---- -neo4j-admin database import full [-h] [--expand-commands] [--verbose] [--auto-skip-subsequent-headers[=true|false]] - [--ignore-empty-strings[=true|false]] [--ignore-extra-columns[=true|false]] - [--legacy-style-quoting[=true|false]] [--normalize-types[=true|false]] - [--overwrite-destination[=true|false]] [--skip-bad-entries-logging[=true|false]] - [--skip-bad-relationships[=true|false]] [--skip-duplicate-nodes[=true|false]] [--strict - [=true|false]] [--trim-strings[=true|false]] [--additional-config=] - [--array-delimiter=] [--bad-tolerance=] [--delimiter=] - [--format=] [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual] +neo4j-admin database import full [-h] [--expand-commands] [--verbose] [--auto-skip-subsequent-headers + [=true|false]] [--ignore-empty-strings[=true|false]] + [--ignore-extra-columns[=true|false]] [--legacy-style-quoting + [=true|false]] [--normalize-types[=true|false]] [--overwrite-destination + [=true|false]] [--skip-bad-entries-logging[=true|false]] + [--skip-bad-relationships[=true|false]] [--skip-duplicate-nodes + [=true|false]] [--strict[=true|false]] [--trim-strings[=true|false]] + [--additional-config=] [--array-delimiter=] + [--bad-tolerance=] [--delimiter=] [--format=] + [--high-parallel-io=on|off|auto] [--id-type=string|integer|actual] [--input-encoding=] [--input-type=csv|parquet] - [--max-off-heap-memory=] [--quote=] [--read-buffer-size=] - [--report-file=] [--schema=] [--temp-path=] [--threads=] - --nodes=[