couchbaselabs · simon-dew · May 10, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/modules/guides/pages/cbo.adoc b/modules/guides/pages/cbo.adoc
@@ -224,7 +224,7 @@ Reference:
 Administrator guides:
 
 * xref:manage:manage-settings/general-settings.adoc[General Settings]
-* xref:manage:monitor/monitoring-n1ql-query.adoc#sys-dictionary[Monitoring Optimizer Statistics]
+* xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-dictionary[Monitor Statistics]
 
 Querying with SDKs:
 

diff --git a/modules/guides/pages/index-advisor.adoc b/modules/guides/pages/index-advisor.adoc
@@ -122,7 +122,7 @@ The `ADVISOR()` function also enables you to get index recommendations for multi
 
 To get advice for multiple queries, use the `ADVISOR()` function with an array argument containing strings which represent each query.
 
-TIP: You can query the xref:manage:monitor/monitoring-n1ql-query.adoc#sys-completed-req[system:completed_requests] catalog to get a list of recently-completed queries.
+TIP: You can query the xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-completed-req[system:completed_requests] catalog to get a list of recently-completed queries.
 
 ====
 The following example gets index advice for recently-completed queries.

diff --git a/modules/guides/pages/prep-statements.adoc b/modules/guides/pages/prep-statements.adoc
@@ -516,7 +516,7 @@ Overview:
 
 Reference:
 
-* xref:manage:monitor/monitoring-n1ql-query.adoc#sys-prepared[Monitoring Prepared Statements]
+* xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-prepared[Manage and Monitor Prepared Statements]
 * xref:n1ql:n1ql-rest-api/admin.adoc#_prepared_statements_resource[{sqlpp} Admin REST API for Prepared Statements]
 
 Querying with SDKs:

diff --git a/modules/learn/pages/services-and-indexes/indexes/index_pushdowns.adoc b/modules/learn/pages/services-and-indexes/indexes/index_pushdowns.adoc
@@ -183,7 +183,7 @@ include::example$services-and-indexes/indexes/pushdown-comp-explain.jsonc[tag=ex
 <.> The second element of `range[]` corresponds to the index-key `sourceairport` with (`low`, `high`) values (`"LAX"`, `"LAX"`) representing equals condition.
 
 The Indexer processes the lookup request and exactly returns only the documents matching the predicate conditions.
-For example, when you xref:manage:monitor/monitoring-n1ql-query.adoc[enable monitoring] with the configuration parameter `profile = "timings"` for this query, you can see that the indexer returns 165 documents, which is the same as the final result set of the query.
+For example, when you xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc[enable monitoring] with the configuration parameter `profile = "timings"` for this query, you can see that the indexer returns 165 documents, which is the same as the final result set of the query.
 
 [source,json]
 ----

diff --git a/modules/learn/pages/services-and-indexes/indexes/query-without-index.adoc b/modules/learn/pages/services-and-indexes/indexes/query-without-index.adoc
@@ -204,7 +204,7 @@ In most cases, this indicates that you should create an index to support the req
 
 Statistics on sequential scan usage are also available in request profiling information.
 
-For more details, see xref:manage:monitor/monitoring-n1ql-query.adoc[].
+For more details, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc[].
 
 === Examples
 

diff --git a/modules/n1ql/pages/n1ql-intro/sysinfo.adoc b/modules/n1ql/pages/n1ql-intro/sysinfo.adoc
@@ -434,4 +434,4 @@ The query returns the result of the expression, 7 in this case.
 
 == Related Links
 
-* Refer to xref:manage:monitor/monitoring-n1ql-query.adoc[Monitor Queries] for more information on the system namespace.
+* Refer to xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc[] for more information on the system namespace.
diff --git a/modules/n1ql/pages/n1ql-language-reference/advisor.adoc b/modules/n1ql/pages/n1ql-language-reference/advisor.adoc
@@ -13,7 +13,7 @@
 :advise: {n1ql}/advise.adoc
 :rules: {n1ql}/advise.adoc#recommendation-rules
 
-:monitor: xref:manage:monitor/monitoring-n1ql-query.adoc
+:monitor: xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc
 :sys-completed-req: {monitor}#sys-completed-req
 :sys-tasks-cache: {monitor}#sys-tasks-cache
 

diff --git a/modules/n1ql/pages/n1ql-language-reference/createfunction.adoc b/modules/n1ql/pages/n1ql-language-reference/createfunction.adoc
@@ -659,5 +659,5 @@ At this level of precision, the geohash should appear to be in almost exactly th
 * To execute a user-defined function, see xref:n1ql-language-reference/execfunction.adoc[].
 * To see the execution plan for a user-defined function, see xref:n1ql-language-reference/explainfunction.adoc[].
 * To include a user-defined function in an expression, see xref:n1ql-language-reference/userfun.adoc[].
-* To monitor user-defined functions, see xref:manage:monitor/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
+* To monitor user-defined functions, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
 * To drop a user-defined function, see xref:n1ql-language-reference/dropfunction.adoc[].
diff --git a/modules/n1ql/pages/n1ql-language-reference/dropfunction.adoc b/modules/n1ql/pages/n1ql-language-reference/dropfunction.adoc
@@ -156,4 +156,4 @@ http://localhost:8093/evaluator/v1/libraries/geohash-js \
 * To execute a user-defined function, see xref:n1ql-language-reference/execfunction.adoc[].
 * To see the execution plan for a user-defined function, see xref:n1ql-language-reference/explainfunction.adoc[].
 * To include a user-defined function in an expression, see xref:n1ql-language-reference/userfun.adoc[].
-* To monitor user-defined functions, see xref:manage:monitor/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
+* To monitor user-defined functions, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
diff --git a/modules/n1ql/pages/n1ql-language-reference/execfunction.adoc b/modules/n1ql/pages/n1ql-language-reference/execfunction.adoc
@@ -97,5 +97,5 @@ For examples, refer to xref:n1ql-language-reference/createfunction.adoc#examples
 * To manage external libraries and external functions, see xref:n1ql-rest-api/functions.adoc[].
 * To see the execution plan for a user-defined function, see xref:n1ql-language-reference/explainfunction.adoc[].
 * To include a user-defined function in an expression, see xref:n1ql-language-reference/userfun.adoc[].
-* To monitor user-defined functions, see xref:manage:monitor/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
+* To monitor user-defined functions, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
 * To drop a user-defined function, see xref:n1ql-language-reference/dropfunction.adoc[].
diff --git a/modules/n1ql/pages/n1ql-language-reference/explainfunction.adoc b/modules/n1ql/pages/n1ql-language-reference/explainfunction.adoc
@@ -141,5 +141,5 @@ include::n1ql:example$utility/explainfunctionjs.jsonc[]
 * To manage external libraries and external functions, see xref:n1ql-rest-api/functions.adoc[].
 * To execute a user-defined function, see xref:n1ql-language-reference/execfunction.adoc[].
 * To include a user-defined function in an expression, see xref:n1ql-language-reference/userfun.adoc[].
-* To monitor user-defined functions, see xref:manage:monitor/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
+* To monitor user-defined functions, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
 * To drop a user-defined function, see xref:n1ql-language-reference/dropfunction.adoc[].
diff --git a/modules/n1ql/pages/n1ql-language-reference/transactions.adoc b/modules/n1ql/pages/n1ql-language-reference/transactions.adoc
@@ -22,7 +22,7 @@
 
 // Manage cross-references
 :install-sample-buckets: xref:manage:manage-settings/install-sample-buckets.adoc
-:sys-transactions: xref:manage:monitor/monitoring-n1ql-query.adoc#sys-transactions
+:sys-transactions: xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-transactions
 
 // Tools cross-references
 :query-workbench: xref:tools:query-workbench.adoc

diff --git a/modules/n1ql/pages/n1ql-language-reference/updatestatistics.adoc b/modules/n1ql/pages/n1ql-language-reference/updatestatistics.adoc
@@ -5,7 +5,7 @@
 :imagesdir: ../../assets/images
 
 // Cross-references
-:monitor: xref:manage:monitor/monitoring-n1ql-query.adoc
+:monitor: xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc
 :n1ql: xref:n1ql-language-reference
 :cbo: {n1ql}/cost-based-optimizer.adoc
 :select: {n1ql}/selectintro.adoc
@@ -121,7 +121,7 @@ You don't need to run `UPDATE STATISTICS` with the same index expression for mul
 === Monitoring Optimizer Statistics
 
 To monitor the optimizer statistics, query the `system:dictionary` and `system:dictionary_cache` keyspaces.
-For further details, refer to {monitor}[Monitor Queries].
+For further details, refer to {monitor}[].
 
 == Related Links
 

diff --git a/modules/n1ql/pages/n1ql-language-reference/userfun.adoc b/modules/n1ql/pages/n1ql-language-reference/userfun.adoc
@@ -191,5 +191,5 @@ At the latitude of the selected hotel, each geohash represents an area of approx
 * To manage external libraries and external functions, see xref:n1ql-rest-api/functions.adoc[].
 * To execute a user-defined function, see xref:n1ql-language-reference/execfunction.adoc[].
 * To see the execution plan for a user-defined function, see xref:n1ql-language-reference/explainfunction.adoc[].
-* To monitor user-defined functions, see xref:manage:monitor/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
+* To monitor user-defined functions, see xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc#sys-functions[Monitor Functions].
 * To drop a user-defined function, see xref:n1ql-language-reference/dropfunction.adoc[].
diff --git a/modules/n1ql/pages/n1ql-manage/index.adoc b/modules/n1ql/pages/n1ql-manage/index.adoc
@@ -25,20 +25,20 @@ You can query the system namespace to get information about the data containers.
 
 * xref:n1ql:n1ql-intro/sysinfo.adoc[]
 
+== Manage Queries
+
+You can monitor and manage queries using the Couchbase Web Console, the command line interface, or the REST API.
+
+* xref:tools:query-monitoring.adoc[]
+* xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc[]
+
 == Manage Primary and Secondary Indexes
 
 You can monitor and manage primary and secondary indexes using the Couchbase Web Console, the command line interface, or the REST API.
 
 * xref:manage:monitor/monitoring-indexes.adoc[]
 * xref:manage:manage-indexes/manage-indexes.adoc[]
 
-== Manage Queries
-
-You can monitor and manage queries using the Couchbase Web Console, the command line interface, or the REST API.
-
-* xref:tools:query-monitoring.adoc[]
-* xref:manage:monitor/monitoring-n1ql-query.adoc[]
-
 == Settings and Parameters
 
 You can configure the Query service using cluster-level query settings, node-level query settings, and request-level query parameters.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -434,4 +434,4 @@ The query returns the result of the expression, 7 in this case.

		== Related Links

		* Refer to xref:manage:monitor/monitoring-n1ql-query.adoc[Monitor Queries] for more information on the system namespace.
		* Refer to xref:n1ql:n1ql-manage/monitoring-n1ql-query.adoc[] for more information on the system namespace.