diff --git a/product_docs/docs/postgres_for_kubernetes/1/bootstrap.mdx b/product_docs/docs/postgres_for_kubernetes/1/bootstrap.mdx
index c7ca32653c3..0276e08a98e 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/bootstrap.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/bootstrap.mdx
@@ -245,9 +245,9 @@ spec:
     size: 1Gi
 ```
 
-EDB Postgres for Kubernetes supports another way to customize the behaviour of the
+EDB Postgres for Kubernetes supports another way to customize the behavior of the
 `initdb` invocation, using the `options` subsection. However, given that there
-are options that can break the behaviour of the operator (such as `--auth` or
+are options that can break the behavior of the operator (such as `--auth` or
 `-d`), this technique is deprecated and will be removed from future versions of
 the API.
 
diff --git a/product_docs/docs/postgres_for_kubernetes/1/faq.mdx b/product_docs/docs/postgres_for_kubernetes/1/faq.mdx
index 496ab3dcede..98f8bf276e0 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/faq.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/faq.mdx
@@ -154,10 +154,29 @@ Our advice is for everyone that wants to fully exploit Cloud Native
 PostgreSQL to acquire the "Certified Kubernetes Administrator (CKA)"
 status from the CNCF certification program.
 
-<!--
-
 ## High availability
 
+**What happens to the PostgreSQL clusters when the operator pod dies or it is
+not available for a certain amount of time?**
+
+The EDB Postgres for Kubernetes operator, among other things, is responsible for self-healing
+capabilities. As such, they might not be available during an outage of the
+operator.
+
+However, assuming that the outage does not affect the nodes where PostgreSQL
+clusters are running, the database will continue to serve normal operations,
+through the relevant Kubernetes services. Moreover, the [instance manager](instance_manager.md),
+which runs inside each PostgreSQL pod will still work, making sure that the
+database server is up, including accessory services like logging, export of
+metrics, continuous archiving of WAL files, etc.
+
+To summarize:
+
+an outage of the operator does not necessarily imply a PostgreSQL
+database outage; it's like running a database without a DBA or system
+administrator.
+
+<!--
 What are the reasons behind EDB Postgres for Kubernetes not relying on a failover
 management tool like Patroni, repmgr, or Stolon?
 
diff --git a/product_docs/docs/postgres_for_kubernetes/1/installation_upgrade.mdx b/product_docs/docs/postgres_for_kubernetes/1/installation_upgrade.mdx
index 8f92569a2a9..22d9ad80db0 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/installation_upgrade.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/installation_upgrade.mdx
@@ -15,12 +15,12 @@ originalFilePath: 'src/installation_upgrade.md'
 The operator can be installed like any other resource in Kubernetes,
 through a YAML manifest applied via `kubectl`.
 
-You can install the [latest operator manifest](https://get.enterprisedb.io/cnp/postgresql-operator-1.17.0.yaml)
+You can install the [latest operator manifest](https://get.enterprisedb.io/cnp/postgresql-operator-1.17.1.yaml)
 as follows:
 
 ```sh
 kubectl apply -f \
-  https://get.enterprisedb.io/cnp/postgresql-operator-1.17.0.yaml
+  https://get.enterprisedb.io/cnp/postgresql-operator-1.17.1.yaml
 ```
 
 Once you have run the `kubectl` command, EDB Postgres for Kubernetes will be installed in your Kubernetes cluster.
@@ -77,7 +77,7 @@ plane for self-managed Kubernetes installations).
 ## Upgrades
 
 !!! Important
-    Please carefully read the [Release notes](rel_notes)
+    Please carefully read the [release notes](release_notes.md)
     before performing an upgrade as some versions might require
     extra steps.
 
@@ -164,7 +164,7 @@ come current periodically and not skipping versions.
     In 2022, EDB plans an LTS release for EDB Postgres for Kubernetes in
     environments where frequent online updates are not possible.
 
-The [Release notes](rel_notes) page contains a detailed list of the
+The [release notes](release_notes.md) page contains a detailed list of the
 changes introduced in every released version of EDB Postgres for Kubernetes,
 and it must be read before upgrading to a newer version of the software.
 
diff --git a/product_docs/docs/postgres_for_kubernetes/1/monitoring.mdx b/product_docs/docs/postgres_for_kubernetes/1/monitoring.mdx
index f8ad95664d9..18c77e6470e 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/monitoring.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/monitoring.mdx
@@ -17,15 +17,14 @@ more `ConfigMap` or `Secret` resources (see the
     [by default a set of predefined metrics](#default-set-of-metrics) in
     a `ConfigMap` called `default-monitoring`.
 
-Metrics can be accessed as follows:
-
-```shell
-curl http://<pod_ip>:9187/metrics
-```
+!!! Info
+    You can inspect the exported metrics by following the instructions in
+    the ["How to inspect the exported metrics"](#how-to-inspect-the-exported-metrics)
+    section below.
 
 All monitoring queries that are performed on PostgreSQL are:
 
--   transactionally atomic (one transaction per query)
+-   atomic (one transaction per query)
 -   executed with the `pg_monitor` role
 -   executed with `application_name` set to `cnp_metrics_exporter`
 -   executed as user `postgres`
@@ -364,7 +363,9 @@ data:
             description: "Number of streaming replicas connected to the instance"
 ```
 
-A list of basic monitoring queries can be found in the [`cnp-basic-monitoring.yaml` file](../samples/cnp-basic-monitoring.yaml).
+A list of basic monitoring queries can be found in the
+[`default-monitoring.yaml` file](https://github.com/EnterpriseDB/cloud-native-postgres/blob/main/config/manager/default-monitoring.yaml)
+that is already installed in your EDB Postgres for Kubernetes deployment (see ["Default set of metrics"](#default-set-of-metrics)).
 
 #### Example of a user defined metric running on multiple databases
 
@@ -560,11 +561,10 @@ in EDB Postgres for Kubernetes' exporter.
 The operator internally exposes [Prometheus](https://prometheus.io/) metrics
 via HTTP on port 8080, named `metrics`.
 
-Metrics can be accessed as follows:
-
-```shell
-curl http://<pod_ip>:8080/metrics
-```
+!!! Info
+    You can inspect the exported metrics by following the instructions in
+    the ["How to inspect the exported metrics"](#how-to-inspect-the-exported-metrics)
+    section below.
 
 Currently, the operator exposes default `kubebuilder` metrics, see
 [kubebuilder documentation](https://book.kubebuilder.io/reference/metrics.html) for more details.
@@ -589,6 +589,70 @@ spec:
     - port: metrics
 ```
 
+## How to inspect the exported metrics
+
+In this section we provide some basic instructions on how to inspect
+the metrics exported by a specific PostgreSQL instance manager (primary
+or replica) or the operator, using a temporary pod running `curl` in
+the same namespace.
+
+!!! Note
+    In the example below we assume we are working in the default namespace,
+    alongside with the PostgreSQL cluster. Please feel free to adapt
+    this example to your use case, by applying basic Kubernetes knowledge.
+
+Create the `curl.yaml` file with this content:
+
+```yaml
+apiVersion: v1
+kind: Pod
+metadata:
+  name: curl
+spec:
+  containers:
+  - name: curl
+    image: curlimages/curl:7.84.0
+    command: ['sleep', '3600']
+```
+
+Then create the pod:
+
+```shell
+kubectl apply -f curl.yaml
+```
+
+In case you want to inspect the metrics exported by an instance, you need
+to connect to port 9187 of the target pod. This is the generic command to be
+run (make sure you use the correct IP for the pod):
+
+```shell
+kubectl exec -ti curl -- curl -s <pod_ip>:9187/metrics
+```
+
+For example, if your PostgreSQL cluster is called `cluster-example` and
+you want to retrieve the exported metrics of the first pod in the cluster,
+you can run the following command to programmatically get the IP of
+that pod:
+
+```shell
+POD_IP=$(kubectl get pod cluster-example-1 --template '{{.status.podIP}}')
+```
+
+And then run:
+
+```shell
+kubectl exec -ti curl -- curl -s ${POD_IP}:9187/metrics
+```
+
+In case you want to access the metrics of the operator, you need to point
+to the pod where the operator is running, and use TCP port 8080 as target.
+
+At the end of the inspection, please make sure you delete the `curl` pod:
+
+```shell
+kubectl delete -f curl.yaml
+```
+
 ## Monitoring on OpenShift
 
 Starting on Openshift 4.6 there is a complete monitoring stack called
diff --git a/product_docs/docs/postgres_for_kubernetes/1/openshift.mdx b/product_docs/docs/postgres_for_kubernetes/1/openshift.mdx
index 0be32cede7a..8cc4ce79587 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/openshift.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/openshift.mdx
@@ -42,6 +42,24 @@ and ["Users and Permissions"](#users-and-permissions) below).
     project. When bound to a user with a local binding, they have full control over
     quota and every action on every resource in the project*".
 
+## Important information about upgrading to a 1.16.x operator version on Openshift
+
+We have made a change to the way conditions are represented in the status of
+the operator in version 1.16.0 and onward. This change could cause an operator
+upgrade to hang on Openshift, if one of the old conditions are set during the
+upgrade process, because of the way the Operator Lifecycle Manager checks new
+CRDs against existing CRs.
+
+To avoid this issue, you need to upgrade to version 1.15.5 first, and then you
+can safely go to 1.16.x or 1.17.x.  
+1.15.5 will automatically remove the offending conditions from all the cluster
+CRs which will unblock Openshift from upgrading. 
+
+!!! Warning 1.15.x is now at End of Life
+
+    No future updates to this version are planned; please use 1.15.5 only temporarily, to 
+    upgrade to 1.16.x or later, as described above.
+
 ## Important OpenShift concepts
 
 To understand how the EDB Postgres for Kubernetes operator fits in an OpenShift environment,
@@ -135,14 +153,14 @@ principles, our recommendation is to use the `fast` channel.
 ### About the `stable` channel
 
 The `stable` channel was previously used by EDB to distribute `cloud-native-postgresql`.
-This channel is **obsolete**, and for back compatibility it is currently set as an alias of
-the `stable-v1.15` channel. `stable` will be removed once version 1.15 goes *End of Life*.
+This channel is **obsolete**, and for backwards compatibility it is currently set to 
+version 1.16.2. The `stable` channel will be removed entirely in the future.
 
-If you were using `stable` before 1.16 was released, you have two options:
+If you are currently using `stable`, you have two options for moving off of it:
 
--   stick with `stable` and therefore remain in the 1.15 minor release, consuming
-    future patch releases
--   move to `fast`, which is the equivalent of `stable` before we introduced support for
+1.  Move to a `stable-vX.Y` channel to remain in a minor release (e.g. `stable-v1.16` would 
+    remain in the 1.16 minor release, consuming future patch releases). 
+2.  Move to `fast`, which is the equivalent of `stable` before we introduced support for
     multiple minor releases with the advent of 1.16
 
 ## Installation via web console
@@ -469,7 +487,7 @@ plane in managing PostgreSQL clusters.
 
 ### Cluster roles
 
-The Operator Licecycle Manager (OLM) automatically creates a set of cluster
+The Operator Lifecycle Manager (OLM) automatically creates a set of cluster
 role objects to facilitate role binding definitions and granular implementation
 of RBAC policies. Some cluster roles have rules that apply to Custom Resource
 Definitions that are part of EDB Postgres for Kubernetes, while others that are
@@ -752,4 +770,4 @@ Then:
 -   set `pgbouncer` as the name of the container (required field in the pod template)
 -   set the *"Image"* field as desired (see the image below)
 
-![Pooler image](./images/pgbouncer-pooler-image.png)
\ No newline at end of file
+![Pooler image](./images/pgbouncer-pooler-image.png)
diff --git a/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_15_5_rel_notes.mdx b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_15_5_rel_notes.mdx
new file mode 100644
index 00000000000..d939daf8b69
--- /dev/null
+++ b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_15_5_rel_notes.mdx
@@ -0,0 +1,20 @@
+---
+title: "EDB Postgres for Kubernetes 1.15.5 release notes"
+navTitle: "Version 1.15.5"
+---
+
+!!!warning
+   Version 1.15 has reached End-of-Life (EOL). Version 1.15.5 is the last release for the 1.15 minor version.
+   
+This release of EDB Postgres for Kubernetes includes the following:
+
+|      Type      |                                                                                                                                                   Description                                                                                                                                                   |
+| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Upstream merge | Merged with community CloudNativePG 1.15.5. See the community [Release Notes](https://cloudnative-pg.io/documentation/1.17/release_notes/v1.15/).                                                                                                                                                               |
+| Enhancement    | Introduces `leaseDuration` and `renewDeadline` parameters in the controller manager to enhance configuration of the leader election in operator deployments.                                                                                                                                                    |
+| Enhancement    | Improves the mechanism that checks that the backup object store is empty before archiving a WAL file for the first time. A new file called `.check-empty-wal-archive` is placed in the `PGDATA` immediately after the cluster is bootstrapped. It is removed after the first WAL file is successfully archived. |
+| Security       | Explicitly sets permissions of the instance manager binary that is copied in the `distroless/static:nonroot` container image, by using the `nonroot:nonroot` user.                                                                                                                                              |
+| Bug fix        | Makes the cluster's conditions compatible with `metav1.Conditions` struct.                                                                                                                                                                                                                                      |
+| Bug fix        | Drops any active connection on a standby after it is promoted to primary.                                                                                                                                                                                                                                       |
+| Bug fix        | Honors `MAPPEDMETRIC` and `DURATION` metric types conversion in the native Prometheus exporter.                                                                                                                                                                                                                 |
+
diff --git a/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_16_3_rel_notes.mdx b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_16_3_rel_notes.mdx
new file mode 100644
index 00000000000..3c78d2f2ff2
--- /dev/null
+++ b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_16_3_rel_notes.mdx
@@ -0,0 +1,15 @@
+---
+title: "EDB Postgres for Kubernetes 1.16.3 release notes"
+navTitle: "Version 1.16.3"
+---
+
+This release of EDB Postgres for Kubernetes includes the following:
+
+|      Type      |                                                                                                                                                   Description                                                                                                                                                   |
+| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Upstream merge | Merged with community CloudNativePG 1.16.3. See the community [Release Notes](https://cloudnative-pg.io/documentation/1.17/release_notes/v1.16/).                                                                                                                                                                |
+| Enhancement    | Introduces `leaseDuration` and `renewDeadline` parameters in the controller manager to enhance configuration of the leader election in operator deployments.                                                                                                                                                    |
+| Enhancement    | Improves the mechanism that checks that the backup object store is empty before archiving a WAL file for the first time. A new file called `.check-empty-wal-archive` is placed in the `PGDATA` immediately after the cluster is bootstrapped. It is removed after the first WAL file is successfully archived. |
+| Security       | Explicitly sets permissions of the instance manager binary that is copied in the `distroless/static:nonroot` container image, by using the `nonroot:nonroot` user.                                                                                                                                              |
+| Bug fix        | Drops any active connection on a standby after it is promoted to primary.                                                                                                                                                                                                                                       |
+| Bug fix        | Honors `MAPPEDMETRIC` and `DURATION` metric types conversion in the native Prometheus exporter.                                                                                                                                                                                                                 |
diff --git a/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_17_1_rel_notes.mdx b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_17_1_rel_notes.mdx
new file mode 100644
index 00000000000..6990f7ff12b
--- /dev/null
+++ b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/1_17_1_rel_notes.mdx
@@ -0,0 +1,16 @@
+---
+title: "EDB Postgres for Kubernetes 1.17.1 release notes"
+navTitle: "Version 1.17.1"
+---
+
+This release of EDB Postgres for Kubernetes includes the following:
+
+|      Type      |                                                                                                                                                   Description                                                                                                                                                   |
+| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Upstream merge | Merged with community CloudNativePG 1.17.1. See the community [Release Notes](https://cloudnative-pg.io/documentation/1.17/release_notes/v1.17/).                                                                                                                                                                |
+| Enhancement    | Introduces `leaseDuration` and `renewDeadline` parameters in the controller manager to enhance configuration of the leader election in operator deployments.                                                                                                                                                    |
+| Enhancement    | Improves the mechanism that checks that the backup object store is empty before archiving a WAL file for the first time. A new file called `.check-empty-wal-archive` is placed in the `PGDATA` immediately after the cluster is bootstrapped. It is removed after the first WAL file is successfully archived. |
+| Security       | Explicitly sets permissions of the instance manager binary that is copied in the `distroless/static:nonroot` container image, by using the `nonroot:nonroot` user.                                                                                                                                              |
+| Bug fix        | Drops any active connection on a standby after it is promoted to primary.                                                                                                                                                                                                                                       |
+| Bug fix        | Honors `MAPPEDMETRIC` and `DURATION` metric types conversion in the native Prometheus exporter.                                                                                                                                                                                                                 |
+| Bug fix        | Ensures that timestamps that are specified with microsecond precision using the PostgreSQL format are correctly parsed.                                                                                                                                                                                         |
diff --git a/product_docs/docs/postgres_for_kubernetes/1/rel_notes/index.mdx b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/index.mdx
index 3f0fc1db67a..e921088287e 100644
--- a/product_docs/docs/postgres_for_kubernetes/1/rel_notes/index.mdx
+++ b/product_docs/docs/postgres_for_kubernetes/1/rel_notes/index.mdx
@@ -4,10 +4,13 @@ navTitle: "Release notes"
 redirects:
 - ../release_notes
 navigation:
+- 1_17_1_rel_notes
 - 1_17_rel_notes
+- 1_16_3_rel_notes
 - 1_16_2_rel_notes
 - 1_16_1_rel_notes
 - 1_16_rel_notes
+- 1_15_5_rel_notes
 - 1_15_4_rel_notes
 - 1_15_3_rel_notes
 - 1_15_2_rel_notes
@@ -39,10 +42,13 @@ The EDB Postgres for Kubernetes documentation describes the major version of EDB
 
 |          Version           | Release date |                                       Upstream merges                                       |
 | -------------------------- | ------------ | ------------------------------------------------------------------------------------------- |
-| [1.17.0](1_17_rel_notes)   | 2022 Sep 6   | Upstream [1.17.0](https://cloudnative-pg.io/documentation/1.16/release_notes/v1.17/) |
+| [1.17.1](1_17_1_rel_notes) | 2022 Oct 7   | Upstream [1.17.1](https://cloudnative-pg.io/documentation/1.17/release_notes/v1.17/) |
+| [1.17.0](1_17_rel_notes)   | 2022 Sep 6   | Upstream [1.17.0](https://cloudnative-pg.io/documentation/1.17/release_notes/v1.17/) |
+| [1.16.3](1_16_3_rel_notes) | 2022 Oct 7   | Upstream [1.16.3](https://cloudnative-pg.io/documentation/1.16/release_notes/v1.16/) |
 | [1.16.2](1_16_2_rel_notes) | 2022 Sep 6   | Upstream [1.16.2](https://cloudnative-pg.io/documentation/1.16/release_notes/v1.16/) |
 | [1.16.1](1_16_1_rel_notes) | 2022 Aug 12  | Upstream [1.16.1](https://cloudnative-pg.io/documentation/1.16/release_notes/v1.16/) |
 | [1.16.0](1_16_rel_notes)   | 2022 Jul 07  | Upstream [1.16.0](https://cloudnative-pg.io/documentation/1.16/release_notes/v1.16) |
+| [1.15.5](1_15_5_rel_notes) | 2022 Oct 7   | Upstream [1.15.5](https://cloudnative-pg.io/documentation/1.15/release_notes/v1.15) |
 | [1.15.4](1_15_4_rel_notes) | 2022 Sep 6   | Upstream [1.15.4](https://cloudnative-pg.io/documentation/1.15/release_notes/v1.15) |
 | [1.15.3](1_15_3_rel_notes) | 2022 Aug 12  | Upstream [1.15.3](https://cloudnative-pg.io/documentation/1.15/release_notes/v1.15) |
 | [1.15.2](1_15_2_rel_notes) | 2022 Jul 07  | Upstream [1.15.2](https://cloudnative-pg.io/documentation/1.15/release_notes/v1.15) |
diff --git a/product_docs/docs/postgres_for_kubernetes/1/samples/cnp-basic-monitoring.yaml b/product_docs/docs/postgres_for_kubernetes/1/samples/cnp-basic-monitoring.yaml
deleted file mode 100644
index f976379ca68..00000000000
--- a/product_docs/docs/postgres_for_kubernetes/1/samples/cnp-basic-monitoring.yaml
+++ /dev/null
@@ -1,540 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cnp-basic-monitoring
-  labels:
-    k8s.enterprisedb.io/reload: ""
-data:
-  custom-queries: |
-    backends:
-      query: |
-       SELECT sa.datname
-           , sa.usename
-           , sa.application_name
-           , states.state
-           , COALESCE(sa.count, 0) AS total
-           , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
-           FROM ( VALUES ('active')
-               , ('idle')
-               , ('idle in transaction')
-               , ('idle in transaction (aborted)')
-               , ('fastpath function call')
-               , ('disabled')
-               ) AS states(state)
-           LEFT JOIN (
-               SELECT datname
-                   , state
-                   , usename
-                   , COALESCE(application_name, '') AS application_name
-                   , COUNT(*)
-                   , COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
-               FROM pg_catalog.pg_stat_activity
-               GROUP BY datname, state, usename, application_name
-           ) sa ON states.state = sa.state
-           WHERE sa.usename IS NOT NULL
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of the database"
-        - usename:
-            usage: "LABEL"
-            description: "Name of the user"
-        - application_name:
-            usage: "LABEL"
-            description: "Name of the application"
-        - state:
-            usage: "LABEL"
-            description: "State of the backend"
-        - total:
-            usage: "GAUGE"
-            description: "Number of backends"
-        - max_tx_duration_seconds:
-            usage: "GAUGE"
-            description: "Maximum duration of a transaction in seconds"
-
-    backends_waiting:
-      query: |
-       SELECT count(*) AS total
-       FROM pg_catalog.pg_locks blocked_locks
-       JOIN pg_catalog.pg_locks blocking_locks
-         ON blocking_locks.locktype = blocked_locks.locktype
-         AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
-         AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
-         AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
-         AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
-         AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
-         AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
-         AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
-         AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
-         AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
-         AND blocking_locks.pid != blocked_locks.pid
-       JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
-       WHERE NOT blocked_locks.granted
-      metrics:
-        - total:
-            usage: "GAUGE"
-            description: "Total number of backends that are currently waiting on other queries"
-
-    pg_database:
-      query: |
-        SELECT datname
-          , pg_catalog.pg_database_size(datname) AS size_bytes
-          , pg_catalog.age(datfrozenxid) AS xid_age
-          , pg_catalog.mxid_age(datminmxid) AS mxid_age
-        FROM pg_catalog.pg_database
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of the database"
-        - size_bytes:
-            usage: "GAUGE"
-            description: "Disk space used by the database"
-        - xid_age:
-            usage: "GAUGE"
-            description: "Number of transactions from the frozen XID to the current one"
-        - mxid_age:
-            usage: "GAUGE"
-            description: "Number of multiple transactions (Multixact) from the frozen XID to the current one"
-
-    pg_postmaster:
-      query: |
-        SELECT EXTRACT(EPOCH FROM pg_postmaster_start_time) AS start_time
-        FROM pg_catalog.pg_postmaster_start_time()
-      metrics:
-        - start_time:
-            usage: "GAUGE"
-            description: "Time at which postgres started (based on epoch)"
-
-    pg_replication:
-      query: "SELECT CASE WHEN NOT pg_catalog.pg_is_in_recovery()
-              THEN 0
-              ELSE GREATEST (0,
-                EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
-              END AS lag,
-              pg_catalog.pg_is_in_recovery() AS in_recovery,
-              EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
-              (SELECT count(*) FROM pg_stat_replication) AS streaming_replicas"
-      metrics:
-        - lag:
-            usage: "GAUGE"
-            description: "Replication lag behind primary in seconds"
-        - in_recovery:
-            usage: "GAUGE"
-            description: "Whether the instance is in recovery"
-        - is_wal_receiver_up:
-            usage: "GAUGE"
-            description: "Whether the instance wal_receiver is up"
-        - streaming_replicas:
-            usage: "GAUGE"
-            description: "Number of streaming replicas connected to the instance"
-
-    pg_replication_slots:
-      query: "SELECT slot_name, database, active, pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), restart_lsn) FROM pg_catalog.pg_replication_slots"
-      metrics:
-        - slot_name:
-            usage: "LABEL"
-            description: "Name of the replication slot"
-        - database:
-            usage: "LABEL"
-            description: "Name of the database"
-        - active:
-            usage: "GAUGE"
-            description: "Flag indicating if the slot is active"
-        - pg_wal_lsn_diff:
-            usage: "GAUGE"
-            description: "Replication lag in bytes"
-
-    pg_stat_archiver:
-      query: |
-        SELECT archived_count
-          , failed_count
-          , COALESCE(EXTRACT(EPOCH FROM (now() - last_archived_time)), -1) AS seconds_since_last_archival
-          , COALESCE(EXTRACT(EPOCH FROM (now() - last_failed_time)), -1) AS seconds_since_last_failure
-          , COALESCE(EXTRACT(EPOCH FROM last_archived_time), -1) AS last_archived_time
-          , COALESCE(EXTRACT(EPOCH FROM last_failed_time), -1) AS last_failed_time
-          , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn
-          , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn
-          , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time
-        FROM pg_catalog.pg_stat_archiver
-      metrics:
-        - archived_count:
-            usage: "COUNTER"
-            description: "Number of WAL files that have been successfully archived"
-        - failed_count:
-            usage: "COUNTER"
-            description: "Number of failed attempts for archiving WAL files"
-        - seconds_since_last_archival:
-            usage: "GAUGE"
-            description: "Seconds since the last successful archival operation"
-        - seconds_since_last_failure:
-            usage: "GAUGE"
-            description: "Seconds since the last failed archival operation"
-        - last_archived_time:
-            usage: "GAUGE"
-            description: "Epoch of the last time WAL archiving succeeded"
-        - last_failed_time:
-            usage: "GAUGE"
-            description: "Epoch of the last time WAL archiving failed"
-        - last_archived_wal_start_lsn:
-            usage: "GAUGE"
-            description: "Archived WAL start LSN"
-        - last_failed_wal_start_lsn:
-            usage: "GAUGE"
-            description: "Last failed WAL LSN"
-        - stats_reset_time:
-            usage: "GAUGE"
-            description: "Time at which these statistics were last reset"
-
-    pg_stat_bgwriter:
-      query: |
-        SELECT checkpoints_timed
-          , checkpoints_req
-          , checkpoint_write_time
-          , checkpoint_sync_time
-          , buffers_checkpoint
-          , buffers_clean
-          , maxwritten_clean
-          , buffers_backend
-          , buffers_backend_fsync
-          , buffers_alloc
-        FROM pg_catalog.pg_stat_bgwriter
-      metrics:
-        - checkpoints_timed:
-            usage: "COUNTER"
-            description: "Number of scheduled checkpoints that have been performed"
-        - checkpoints_req:
-            usage: "COUNTER"
-            description: "Number of requested checkpoints that have been performed"
-        - checkpoint_write_time:
-            usage: "COUNTER"
-            description: "Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds"
-        - checkpoint_sync_time:
-            usage: "COUNTER"
-            description: "Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds"
-        - buffers_checkpoint:
-            usage: "COUNTER"
-            description: "Number of buffers written during checkpoints"
-        - buffers_clean:
-            usage: "COUNTER"
-            description: "Number of buffers written by the background writer"
-        - maxwritten_clean:
-            usage: "COUNTER"
-            description: "Number of times the background writer stopped a cleaning scan because it had written too many buffers"
-        - buffers_backend:
-            usage: "COUNTER"
-            description: "Number of buffers written directly by a backend"
-        - buffers_backend_fsync:
-            usage: "COUNTER"
-            description: "Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)"
-        - buffers_alloc:
-            usage: "COUNTER"
-            description: "Number of buffers allocated"
-
-    pg_stat_database:
-      query: |
-        SELECT datname
-          , xact_commit
-          , xact_rollback
-          , blks_read
-          , blks_hit
-          , tup_returned
-          , tup_fetched
-          , tup_inserted
-          , tup_updated
-          , tup_deleted
-          , conflicts
-          , temp_files
-          , temp_bytes
-          , deadlocks
-          , blk_read_time
-          , blk_write_time
-        FROM pg_catalog.pg_stat_database
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of this database"
-        - xact_commit:
-            usage: "COUNTER"
-            description: "Number of transactions in this database that have been committed"
-        - xact_rollback:
-            usage: "COUNTER"
-            description: "Number of transactions in this database that have been rolled back"
-        - blks_read:
-            usage: "COUNTER"
-            description: "Number of disk blocks read in this database"
-        - blks_hit:
-            usage: "COUNTER"
-            description: "Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (this only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)"
-        - tup_returned:
-            usage: "COUNTER"
-            description: "Number of rows returned by queries in this database"
-        - tup_fetched:
-            usage: "COUNTER"
-            description: "Number of rows fetched by queries in this database"
-        - tup_inserted:
-            usage: "COUNTER"
-            description: "Number of rows inserted by queries in this database"
-        - tup_updated:
-            usage: "COUNTER"
-            description: "Number of rows updated by queries in this database"
-        - tup_deleted:
-            usage: "COUNTER"
-            description: "Number of rows deleted by queries in this database"
-        - conflicts:
-            usage: "COUNTER"
-            description: "Number of queries canceled due to conflicts with recovery in this database"
-        - temp_files:
-            usage: "COUNTER"
-            description: "Number of temporary files created by queries in this database"
-        - temp_bytes:
-            usage: "COUNTER"
-            description: "Total amount of data written to temporary files by queries in this database"
-        - deadlocks:
-            usage: "COUNTER"
-            description: "Number of deadlocks detected in this database"
-        - blk_read_time:
-            usage: "COUNTER"
-            description: "Time spent reading data file blocks by backends in this database, in milliseconds"
-        - blk_write_time:
-            usage: "COUNTER"
-            description: "Time spent writing data file blocks by backends in this database, in milliseconds"
-
-    pg_stat_database_conflicts:
-      query: "SELECT datname, confl_tablespace, confl_lock, confl_snapshot, confl_bufferpin, confl_deadlock FROM pg_catalog.pg_stat_database_conflicts"
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of the database"
-        - confl_tablespace:
-            usage: "COUNTER"
-            description: "Number of queries in this database that have been canceled due to dropped tablespaces"
-        - confl_lock:
-            usage: "COUNTER"
-            description: "Number of queries in this database that have been canceled due to lock timeouts"
-        - confl_snapshot:
-            usage: "COUNTER"
-            description: "Number of queries in this database that have been canceled due to old snapshots"
-        - confl_bufferpin:
-            usage: "COUNTER"
-            description: "Number of queries in this database that have been canceled due to pinned buffers"
-        - confl_deadlock:
-            usage: "COUNTER"
-            description: "Number of queries in this database that have been canceled due to deadlocks"
-
-    pg_stat_user_tables:
-      target_databases:
-        - "*"
-      query: |
-       SELECT
-         current_database() datname,
-         schemaname,
-         relname,
-         seq_scan,
-         seq_tup_read,
-         idx_scan,
-         idx_tup_fetch,
-         n_tup_ins,
-         n_tup_upd,
-         n_tup_del,
-         n_tup_hot_upd,
-         n_live_tup,
-         n_dead_tup,
-         n_mod_since_analyze,
-         COALESCE(last_vacuum, '1970-01-01Z') as last_vacuum,
-         COALESCE(last_autovacuum, '1970-01-01Z') as last_autovacuum,
-         COALESCE(last_analyze, '1970-01-01Z') as last_analyze,
-         COALESCE(last_autoanalyze, '1970-01-01Z') as last_autoanalyze,
-         vacuum_count,
-         autovacuum_count,
-         analyze_count,
-         autoanalyze_count
-       FROM
-         pg_catalog.pg_stat_user_tables
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of current database"
-        - schemaname:
-            usage: "LABEL"
-            description: "Name of the schema that this table is in"
-        - relname:
-            usage: "LABEL"
-            description: "Name of this table"
-        - seq_scan:
-            usage: "COUNTER"
-            description: "Number of sequential scans initiated on this table"
-        - seq_tup_read:
-            usage: "COUNTER"
-            description: "Number of live rows fetched by sequential scans"
-        - idx_scan:
-            usage: "COUNTER"
-            description: "Number of index scans initiated on this table"
-        - idx_tup_fetch:
-            usage: "COUNTER"
-            description: "Number of live rows fetched by index scans"
-        - n_tup_ins:
-            usage: "COUNTER"
-            description: "Number of rows inserted"
-        - n_tup_upd:
-            usage: "COUNTER"
-            description: "Number of rows updated"
-        - n_tup_del:
-            usage: "COUNTER"
-            description: "Number of rows deleted"
-        - n_tup_hot_upd:
-            usage: "COUNTER"
-            description: "Number of rows HOT updated (i.e., with no separate index update required)"
-        - n_live_tup:
-            usage: "GAUGE"
-            description: "Estimated number of live rows"
-        - n_dead_tup:
-            usage: "GAUGE"
-            description: "Estimated number of dead rows"
-        - n_mod_since_analyze:
-            usage: "GAUGE"
-            description: "Estimated number of rows changed since last analyze"
-        - last_vacuum:
-            usage: "GAUGE"
-            description: "Last time at which this table was manually vacuumed (not counting VACUUM FULL)"
-        - last_autovacuum:
-            usage: "GAUGE"
-            description: "Last time at which this table was vacuumed by the autovacuum daemon"
-        - last_analyze:
-            usage: "GAUGE"
-            description: "Last time at which this table was manually analyzed"
-        - last_autoanalyze:
-            usage: "GAUGE"
-            description: "Last time at which this table was analyzed by the autovacuum daemon"
-        - vacuum_count:
-            usage: "COUNTER"
-            description: "Number of times this table has been manually vacuumed (not counting VACUUM FULL)"
-        - autovacuum_count:
-            usage: "COUNTER"
-            description: "Number of times this table has been vacuumed by the autovacuum daemon"
-        - analyze_count:
-            usage: "COUNTER"
-            description: "Number of times this table has been manually analyzed"
-        - autoanalyze_count:
-            usage: "COUNTER"
-            description: "Number of times this table has been analyzed by the autovacuum daemon"
-
-    pg_stat_replication:
-      primary: true
-      query: |
-       SELECT usename
-         , COALESCE(application_name, '') AS application_name
-         , COALESCE(client_addr::text, '') AS client_addr
-         , EXTRACT(EPOCH FROM backend_start) AS backend_start
-         , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
-         , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
-         , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
-         , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
-         , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
-       FROM pg_catalog.pg_stat_replication
-      metrics:
-        - usename:
-            usage: "LABEL"
-            description: "Name of the replication user"
-        - application_name:
-            usage: "LABEL"
-            description: "Name of the application"
-        - client_addr:
-            usage: "LABEL"
-            description: "Client IP address"
-        - backend_start:
-            usage: "COUNTER"
-            description: "Time when this process was started"
-        - backend_xmin_age:
-            usage: "COUNTER"
-            description: "The age of this standby's xmin horizon"
-        - sent_diff_bytes:
-            usage: "GAUGE"
-            description: "Difference in bytes from the last write-ahead log location sent on this connection"
-        - write_diff_bytes:
-            usage: "GAUGE"
-            description: "Difference in bytes from the last write-ahead log location written to disk by this standby server"
-        - flush_diff_bytes:
-            usage: "GAUGE"
-            description: "Difference in bytes from the last write-ahead log location flushed to disk by this standby server"
-        - replay_diff_bytes:
-            usage: "GAUGE"
-            description: "Difference in bytes from the last write-ahead log location replayed into the database on this standby server"
-        - write_lag_seconds:
-            usage: "GAUGE"
-            description: "Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written it"
-        - flush_lag_seconds:
-            usage: "GAUGE"
-            description: "Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written and flushed it"
-        - replay_lag_seconds:
-            usage: "GAUGE"
-            description: "Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written, flushed and applied it"
-
-    pg_statio_user_tables:
-      target_databases:
-        - "*"
-      query: |
-        SELECT
-          current_database() datname
-          , schemaname
-          , relname
-          , heap_blks_read
-          , heap_blks_hit
-          , idx_blks_read
-          , idx_blks_hit
-          , toast_blks_read
-          , toast_blks_hit
-          , tidx_blks_read
-          , tidx_blks_hit
-        FROM pg_catalog.pg_statio_user_tables
-      metrics:
-        - datname:
-            usage: "LABEL"
-            description: "Name of current database"
-        - schemaname:
-            usage: "LABEL"
-            description: "Name of the schema that this table is in"
-        - relname:
-            usage: "LABEL"
-            description: "Name of this table"
-        - heap_blks_read:
-            usage: "COUNTER"
-            description: "Number of disk blocks read from this table"
-        - heap_blks_hit:
-            usage: "COUNTER"
-            description: "Number of buffer hits in this table"
-        - idx_blks_read:
-            usage: "COUNTER"
-            description: "Number of disk blocks read from all indexes on this table"
-        - idx_blks_hit:
-            usage: "COUNTER"
-            description: "Number of buffer hits in all indexes on this table"
-        - toast_blks_read:
-            usage: "COUNTER"
-            description: "Number of disk blocks read from this table's TOAST table (if any)"
-        - toast_blks_hit:
-            usage: "COUNTER"
-            description: "Number of buffer hits in this table's TOAST table (if any)"
-        - tidx_blks_read:
-            usage: "COUNTER"
-            description: "Number of disk blocks read from this table's TOAST table indexes (if any)"
-        - tidx_blks_hit:
-            usage: "COUNTER"
-            description: "Number of buffer hits in this table's TOAST table indexes (if any)"
-
-    pg_settings:
-      query: |
-        SELECT name,
-        CASE setting WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE setting END AS setting
-        FROM pg_catalog.pg_settings
-        WHERE vartype IN ('integer', 'real', 'bool')
-        ORDER BY 1
-      metrics:
-        - name:
-            usage: "LABEL"
-            description: "Name of the setting"
-        - setting:
-            usage: "GAUGE"
-            description: "Setting value"