Doc changes for PMM3 Beta

docs/install-pmm/install-pmm-client/connect-database/external.md

@@ -64,7 +64,7 @@ For more details see <https://prometheus.io/docs/instrumenting/writing_exporters
     ```sh
     root@mysql1:~# pmm-admin add external --group=processes  --listen-port=9256
     External Service added.
-    Service ID  : /service_id/6485f4fd-745b-4dfb-8b72-328e300f8b50
+    Service ID  : /6485f4fd-745b-4dfb-8b72-328e300f8b50
     Service name: mysql1-processes
     Group       : processes
     ```

docs/install-pmm/install-pmm-client/connect-database/haproxy.md

@@ -27,7 +27,7 @@ The output of this command should look as follows:
 
 ```txt
 HAProxy Service added.
-Service ID  : /service_id/c481183f-70a2-443f-91e5-cae5cecd06a2
+Service ID  : /c481183f-70a2-443f-91e5-cae5cecd06a2
 Service name: Ubuntu-haproxy
 ```
 

docs/install-pmm/install-pmm-client/connect-database/proxysql.md

@@ -21,7 +21,7 @@ pmm-admin add proxysql --username=pmm --password=pmm
 
 ```text
 ProxySQL Service added.
-Service ID  : /service_id/f69df379-6584-4db5-a896-f35ae8c97573
+Service ID  : /f69df379-6584-4db5-a896-f35ae8c97573
 Service name: ubuntu-proxysql
 ```
 

docs/pmm-admin/roles/access-control/labels.md

@@ -15,7 +15,7 @@ PMM supports standard as well as custom labels. PMM automatically assigns standa
 
 | **Label Type**| **Object**| **Label name **| **Example** |                                                                                                
 |----------|--------|-------|------------------------------|
-| **Standard**  | Node   | node_id |/node_id/123|                                          
+| **Standard**  | Node   | node_id |/123|                                          
 |          | Service|service_type   |   - mysql, mongodb, postgresql etc.                                     
 | **Custom**| Node, Service, Agent| Any string matching regular expression: <br /> [a-zA-Z_][a-zA-Z0-9_]*. <br /> Also, it cannot start with two underscores.| owner="joe"<br/> _rack="12345"|
 

docs/release-notes/3.0.0_Beta.md

@@ -0,0 +1,27 @@
+# Percona Monitoring and Management 3.0.0 Alpha
+
+| **Release date** | September 16th, 2024                                                                                   |
+| ----------------- | ----------------------------------------------------------------------------------------------- |
+| **Installation** | [Installing Percona Monitoring and Management](https://www.percona.com/software/pmm/quickstart) |
+
+Percona Monitoring and Management (PMM) is an open source database monitoring, management, and observability solution for MySQL, PostgreSQL, and MongoDB.
+
+It enables you to observe the health of your database systems, explore new patterns in their behavior, troubleshoot them and execute database management operations—regardless of whether your databases are located on-premises or in the cloud.
+
+## Release highlights
+
+### Breaking API changes
+
+#### Removed database ID prefixes
+
+We have removed prefixes from database record identifiers (IDs) in PMM to improve REST API compatibility and simplify ID handling.
+
+This change affects various components, including nodes, agents, services, and backup-related entities. As a result:
+
+- Database identifiers are now represented as plain UUIDs without prefixes (e.g., `/node_id/`, `/agent_id/`, `/service_id/`).
+- API endpoints using IDs as path parameters now use a new format
+- Exporter passwords (previously identical to the prefixed `agent_id`) have changed
+- Metrics labels that used `agent_id` have been updated
+
+**Impact**
+Make sure to update any custom scripts, integrations, or alerts that rely on the old exporter ID format to ensure compatibility with this new structure.

docs/release-notes/index.md

@@ -1,2 +1,3 @@
 # Release Notes
-- [Percona Monitoring and Management 3.0.0 Alpha](3.0.0_Alpha.md)
+- [Percona Monitoring and Management 3.0.0 Alpha](3.0.0_Alpha.md)
+- [Percona Monitoring and Management 3.0.0 Beta](3.0.0_Beta.md)

docs/use/commands/pmm-admin.md

@@ -160,7 +160,7 @@ PMM communicates with the PMM Server via a PMM agent process.
     `--server-url=server-url`
     : PMM Server URL in `https://username:password@pmm-server-host/` format.
 
-    `--machine-id="/machine_id/9812826a1c45454a98ba45c56cc4f5b0"`
+    `--machine-id="/9812826a1c45454a98ba45c56cc4f5b0"`
     : Node machine-id (default is auto-detected).
 
     `--distro="linux"`
@@ -903,7 +903,7 @@ pmm-admin add mysql --query-source=slowlog --username=pmm --password=pmm sl-mysq
 
 ```txt
 MySQL Service added.
-Service ID  : /service_id/a89191d4-7d75-44a9-b37f-a528e2c4550f
+Service ID  : /a89191d4-7d75-44a9-b37f-a528e2c4550f
 Service name: sl-mysql
 ```
 
@@ -917,8 +917,8 @@ pmm-admin status --wait=30s
 ```
 
 ```txt
-Agent ID: /agent_id/c2a55ac6-a12f-4172-8850-4101237a4236
-Node ID : /node_id/29b2cc24-3b90-4892-8d7e-4b44258d9309
+Agent ID: /c2a55ac6-a12f-4172-8850-4101237a4236
+Node ID : /29b2cc24-3b90-4892-8d7e-4b44258d9309
 PMM Server:
  URL : https://x.x.x.x:443/
  Version: 2.5.0
@@ -929,7 +929,7 @@ PMM Client:
  pmm-admin version: 2.5.0
  pmm-agent version: 2.5.0
 Agents:
- /agent_id/aeb42475-486c-4f48-a906-9546fc7859e8 mysql_slowlog_agent Running
+ /aeb42475-486c-4f48-a906-9546fc7859e8 mysql_slowlog_agent Running
 ```
 
 ### Disable collectors

docs/use/commands/pmm-agent.md

@@ -40,7 +40,7 @@ Most options can be set via environment variables (shown in parentheses).
 | `--debug`                              | `PMM_AGENT_DEBUG`                   | Enable debug output.
 | `--distro=distro`                      | `PMM_AGENT_SETUP_DISTRO`            | Node OS distribution (default is auto-detected).
 | `--force`                              | `PMM_AGENT_SETUP_FORCE`             | Remove Node with that name and all dependent Services and Agents (if existing).
-| `--id=/agent_id/...`                   | `PMM_AGENT_ID`                      | ID of this pmm-agent.
+| `--id=/...`                   | `PMM_AGENT_ID`                      | ID of this pmm-agent.
 | `--listen-address=LISTEN-ADDRESS`      | `PMM_AGENT_LISTEN_ADDRESS`          | Agent local API address.
 | `--listen-port=LISTEN-PORT`            | `PMM_AGENT_LISTEN_PORT`             | Agent local API port.
 | `--machine-id=machine-id`              | `PMM_AGENT_SETUP_MACHINE_ID`        | Node machine ID (default is auto-detected).
@@ -87,7 +87,7 @@ Config output:
 ````
 # Updated by `pmm-agent setup`.
 ---
-id: /agent_id/be568008-b1b4-4bd9-98c7-392d1f4b724e
+id: /be568008-b1b4-4bd9-98c7-392d1f4b724e
 listen-address: 127.0.0.1
 listen-port: 7777
 server:
@@ -129,7 +129,7 @@ Config output:
 ````
 # Updated by `pmm-agent setup`.
 ---
-id: /agent_id/afce1917-8836-4857-b3e5-ad372c2ddbe5
+id: /afce1917-8836-4857-b3e5-ad372c2ddbe5
 listen-address: 127.0.0.1
 listen-port: 7777
 server:

variables.yml

@@ -1,9 +1,9 @@
 # PMM Version for HTML
 # See also mkdocs.yml plugins.with-pdf.cover_subtitle and output_path
 
-release: '3.0.0'
-version: '3.0.0'
-release_date: 2024-03-12
+release: '3.0.0 Beta'
+version: '3.0.0 Beta'
+release_date: 2024-09-12
 # SVG icons. Use in markdown as {{icon.<name>}}
 # For the Percona image icon (encoded inline SVG), see https://css-tricks.com/using-svg/
 icon: