Merge to v3 (#4255)

* Bring back missing Server options (#4252)

* bring back missing options

* fix links

* chore: trigger the build

* added icon

---------

Co-authored-by: Alex Demidoff <[email protected]>

* Fix the wrong port mapping (#4253)

* Fix the wrong port mapping

* chore: trigger the build

* Fix the wrong port mapping (#4253)

* Fix the wrong port mapping

* chore: trigger the build

---------

Co-authored-by: Alex Demidoff <[email protected]>

Author: catalinaadam

documentation/docs/install-pmm/index.md

@@ -1,8 +1,5 @@
 # PMM installation overview
 
-!!! info "Content under improvement"
-    We're currently enhancing this chapter to make it more accurate and easier to follow. Content may be updated as improvements are made. [Share your feedback](https://docs.google.com/forms/d/1bkWACehjqlwA0AKf-qTJcXvYbOSYgze8iTPXjntqmNo/edit) to help us improve it.
-
 Installing Percona Monitoring and Management (PMM) involves setting up a central PMM Server and distributed PMM Clients that work together to monitor your database environment. 
 
 PMM Server provides the web interface with dashboards and analytics, while PMM Clients collect data from your databases with minimal performance impact and send it back to PMM Server for analysis and visualization.
@@ -32,7 +29,9 @@ Compare the available deployment methods to choose what works best for your setu
 |-------------------|----------|------------|----------------|
 | [Docker](../install-pmm/install-pmm-server/deployment-options/docker/index.md) | Quick setup, development environments | • Fast deployment<br>• Easy to manage<br>• Runs without root privileges<br>• Minimal resource overhead | • Requires Docker knowledge<br>• May need additional network configuration |
 | [Podman](../install-pmm/install-pmm-server/deployment-options/podman/index.md) | Security-conscious environments | • Rootless by default<br>• Enhanced security<br>• Docker-compatible commands<br>• No daemon required | • Requires Podman installation<br>• Less common than Docker |
-<!---| [Amazon AWS](../install-pmm/install-pmm-server/deployment-options/aws/aws.md) | 1. Wizard-driven install. <br>  2. Rootless| Paid, incurs infrastructure costs. --->
+| [Helm](../install-pmm/install-pmm-server/deployment-options/helm/index.md) | Kubernetes environments | • Native Kubernetes deployment<br>• Scalable and orchestrated<br>• ConfigMap and Secret management<br>• Ingress controller support | • Requires Kubernetes cluster<br>• Helm knowledge needed<br>• More complex setup |
+| [Virtual Appliance](../install-pmm/install-pmm-server/deployment-options/virtual/index.md) | Traditional VM environments | • Pre-configured virtual machine<br>• Works with VMware, VirtualBox<br>• No container knowledge required<br>• Isolated environment | • Larger resource footprint<br>• VM management overhead<br>• Less flexible than containers |
+| [Amazon AWS](../install-pmm/install-pmm-server/deployment-options/aws/deploy_aws.md) | AWS cloud deployments | • Wizard-driven install<br>• Rootless deployment<br>• Integrated with AWS services | • Paid service, incurs infrastructure costs<br>• AWS-specific deployment |
 
 ## Installation steps 
 
@@ -60,10 +59,10 @@ Install and run at least one PMM Server using one of the following deployment me
 
     [**Get started with Virtual Appliance** :material-arrow-right:](../install-pmm/install-pmm-server/deployment-options/virtual/index.md)
 
-<!---=== ":material-aws: AWS Marketplace"
+=== ":material-aws: AWS Marketplace"
     Deploy PMM Server from AWS Marketplace
 
-    [**Get started with AWS deployment** :material-arrow-right:](../install-pmm/install-pmm-server/deployment-options/aws/aws.md) -->
+    [**Get started with AWS deployment** :material-arrow-right:](../install-pmm/install-pmm-server/deployment-options/aws/deploy_aws.md).
 
 ### 2. Install PMM Client
 

documentation/docs/install-pmm/plan-pmm-installation/choose-deployment.md

@@ -38,7 +38,7 @@ For information on PMM's architecture, see [PMM architecture](../../reference/in
 | [**:material-shield-lock: Podman**](../install-pmm-server/deployment-options/podman/index.md) | Security-focused setups | ✔ Rootless containers<br> ✔  Enhanced security<br> ✔  OCI-compatible | ⚠ Requires Podman installation & knowledge |
 | [**:material-kubernetes: Helm**](../install-pmm-server/deployment-options/helm/index.md) | Cloud-native environments | ✔  Scalable & high availability<br> ✔  Kubernetes-native | ⚠ Requires existing Kubernetes cluster<br>⚠ More complex setup |
 | [**:material-server: Virtual Appliance**](../install-pmm-server/deployment-options/virtual/index.md) | Traditional environments | ✔  Pre-configured with all dependencies<br>✔  Dedicated resources | ⚠ Larger resource footprint<br>⚠ Requires a hypervisor |
-<!----| [Amazon AWS](../install-pmm/install-pmm-server/deployment-options/aws/aws.md) | AWS-based environments | Seamless AWS integration, easy provisioning | Monthly subscription costs, AWS infrastructure costs | --->
+| [**:material-aws: Amazon AWS**](../install-pmm-server/deployment-options/aws/deploy_aws.md) | AWS-based environments | Seamless AWS integration, easy provisioning | Monthly subscription costs, AWS infrastructure costs |
 
 ## PMM Client deployment options
 

documentation/docs/pmm-upgrade/ui_upgrade.md

@@ -2,7 +2,7 @@
 
 PMM Server and Client components are installed and updated separately.
 
-PMM v3 Server can run natively, as a Docker image, a virtual appliance<!----or an AWS cloud instance-->. While each environment has its own specific installation and update steps, the UI-based upgrade method is universal and recommended for most users.
+PMM v3 Server can run natively, as a Docker image, a virtual appliance or an AWS cloud instance. While each environment has its own specific installation and update steps, the UI-based upgrade method is universal and recommended for most users.
 
 ## Prerequisites
 

documentation/docs/quickstart/quickstart.md

@@ -11,7 +11,7 @@ This is the simplest and most efficient way to install PMM with Docker.
     - [Deploy based on a Docker image](../install-pmm/install-pmm-server/deployment-options/docker/index.md)
     - [Deploy on Virtual Appliance](../install-pmm/install-pmm-server/deployment-options/virtual/index.md)
     - [Deploy on Kubernetes via Helm](../install-pmm/install-pmm-server/deployment-options/helm/index.md)
-   <!--- - [Run a PMM instance hosted at AWS Marketplace](../install-pmm/install-pmm-server/deployment-options/aws/aws.md)-->
+    - [Run a PMM instance hosted at AWS Marketplace](../install-pmm/install-pmm-server/deployment-options/aws/deploy_aws.md)
 
 #### Prerequisites
 

documentation/docs/release-notes/3.0.0.md

@@ -166,7 +166,7 @@ We've simplified AWS installations to match our standard Docker/Podman workflow.
 
 Use **admin** as the username and your EC2 Instance ID as the password (the default PMM password cannot be used for security reasons).
 
-You can find your Instance ID in the AWS Console. <!---For detailed instructions, see [Install PMM Server on AWS Marketplace](../install-pmm/install-pmm-server/deployment-options/aws/aws.md).-->
+You can find your Instance ID in the AWS Console. For detailed instructions, see [Install PMM Server on AWS Marketplace](../install-pmm/install-pmm-server/deployment-options/aws/deploy_aws.md).
 
 ### Official ARM support for PMM Client
 

documentation/docs/use/dashboards-panels/share-dashboards/share_dashboard.md

@@ -48,7 +48,7 @@ To enable image rendering:
     docker run -d \
     --name pmm-server \
     --network=pmm-network \
-    -p 8443:443 \
+    -p 443:8443 \
     -e GF_RENDERING_SERVER_URL=http://renderer:8081/render \
     -e GF_RENDERING_CALLBACK_URL=https://pmm-server:8443/graph/ \
     percona/pmm-server:3