From e336238b63be91bfe449b86378857af2bea3ce6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Marti=CC=81nez=20Bernardo?= Date: Thu, 10 Apr 2025 13:04:08 +0200 Subject: [PATCH 1/5] Add uninstall instructions to RUM auto instrumentation server-side --- .../browser/setup/server/apache.md | 12 ++++++++- .../browser/setup/server/ibm.md | 12 ++++++++- .../browser/setup/server/nginx.md | 25 ++++++++++++++++++- .../browser/setup/server/windows_iis.md | 4 +++ 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/content/en/real_user_monitoring/browser/setup/server/apache.md b/content/en/real_user_monitoring/browser/setup/server/apache.md index 0c64c40e5a6b6..215fb8fe89e08 100644 --- a/content/en/real_user_monitoring/browser/setup/server/apache.md +++ b/content/en/real_user_monitoring/browser/setup/server/apache.md @@ -113,4 +113,14 @@ If you notice that RUM is not being injected into HTML pages, consider the follo [3]: https://httpd.apache.org/modules/ [4]: https://app.datadoghq.com/rum/list [5]: /real_user_monitoring/guide/sampling-browser-plans/ -[6]: https://rum-auto-instrumentation.s3.amazonaws.com/httpd/latest/mod_datadog-amd64.zip \ No newline at end of file +[6]: https://rum-auto-instrumentation.s3.amazonaws.com/httpd/latest/mod_datadog-amd64.zip + +## Uninstall + +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: + +1. Locate your Apache httpd binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. +2. Locate the Apache httpd configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. +3. Edit the file by removing the following line at the end: `Include /opt/datadog-httpd/datadog.conf` +4. Delete the directory `/opt/datadog-httpd/` and all its contents. +5. Finally, restart or reload Apache httpd. diff --git a/content/en/real_user_monitoring/browser/setup/server/ibm.md b/content/en/real_user_monitoring/browser/setup/server/ibm.md index 517a2412ad518..5b29e34e11921 100644 --- a/content/en/real_user_monitoring/browser/setup/server/ibm.md +++ b/content/en/real_user_monitoring/browser/setup/server/ibm.md @@ -117,4 +117,14 @@ If you notice that RUM is not being injected into HTML pages, consider the follo [2]: /agent/ [3]: https://httpd.apache.org/modules/ [4]: https://rum-auto-instrumentation.s3.amazonaws.com/httpd/latest/mod_datadog-amd64.zip -[5]: https://app.datadoghq.com/rum/list \ No newline at end of file +[5]: https://app.datadoghq.com/rum/list + +## Uninstall + +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: + +1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. +2. Locate the IBM HTTP Server configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. +3. Edit the file by removing the following line at the end: `Include /opt/datadog-httpd/datadog.conf` +4. Delete the directory `/opt/datadog-httpd/` and all its contents. +5. Finally, restart or reload IBM HTTP Server. diff --git a/content/en/real_user_monitoring/browser/setup/server/nginx.md b/content/en/real_user_monitoring/browser/setup/server/nginx.md index 19a75f92738d3..a842789d68507 100644 --- a/content/en/real_user_monitoring/browser/setup/server/nginx.md +++ b/content/en/real_user_monitoring/browser/setup/server/nginx.md @@ -124,6 +124,29 @@ If you notice that RUM is not being injected into HTML pages, consider the follo - **Content-Type mismatch**: RUM is injected only into HTML pages. If the `Content-Type` header does not correctly indicate `text/html`, the injection is skipped. - **Upstream server has end-to-end encryption or content compression**: See [Limitations](#limitations). +## Uninstall + +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: + +1. Locate the NGINX configuration file by running `nginx -T`. Example: `/etc/nginx/nginx.conf`. +2. Edit the file by removing the following line at the beginning: `load_module /opt/datadog-nginx/ngx_http_datadog_module.so;` +3. Edit the file by removing all existing `datadog_*` sections from within the `http` directive. They will look similar to these, depending on your system configuration: + + ``` + datadog_agent_url http://datadog-agent:8126; + + datadog_tracing off; + + datadog_rum on; + + datadog_rum_config { + # ... specific RUM configuration + } + ``` + +4. Delete the directory `/opt/datadog-nginx/` and all its contents. +5. Finally, restart or reload NGINX. + ## Reference ### NGINX modules @@ -186,4 +209,4 @@ If you notice that RUM is not being injected into HTML pages, consider the follo [36]: https://rum-auto-instrumentation.s3.amazonaws.com/nginx/latest/ngx_http_datadog_module-arm64-1.27.3.so.tgz [37]: https://rum-auto-instrumentation.s3.amazonaws.com/nginx/latest/ngx_http_datadog_module-amd64-1.27.4.so.tgz [38]: https://rum-auto-instrumentation.s3.amazonaws.com/nginx/latest/ngx_http_datadog_module-arm64-1.27.4.so.tgz -[39]: https://nginx.org/en/docs/ngx_core_module.html#error_log \ No newline at end of file +[39]: https://nginx.org/en/docs/ngx_core_module.html#error_log diff --git a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md index 44e74b531f60a..d2ebd202f828c 100644 --- a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md +++ b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md @@ -79,3 +79,7 @@ If you notice that RUM is not being injected into HTML pages, consider the follo [2]: /agent/ [3]: https://app.datadoghq.com/rum/list/create/ [4]: /real_user_monitoring/guide/best-practices-for-rum-sampling/ + +## Uninstall + +Completely uninstall RUM Auto-Instrumentation by uninstalling Datadog RUM from Windows' Apps & features. From 2b388d111e839ce6e3f8c7f014cc73ca1642be00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Marti=CC=81nez=20Bernardo?= Date: Thu, 10 Apr 2025 15:20:20 +0200 Subject: [PATCH 2/5] Formatting --- .../real_user_monitoring/browser/setup/server/apache.md | 4 ++-- .../en/real_user_monitoring/browser/setup/server/ibm.md | 4 ++-- .../real_user_monitoring/browser/setup/server/nginx.md | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/content/en/real_user_monitoring/browser/setup/server/apache.md b/content/en/real_user_monitoring/browser/setup/server/apache.md index 215fb8fe89e08..d771df8ee17fb 100644 --- a/content/en/real_user_monitoring/browser/setup/server/apache.md +++ b/content/en/real_user_monitoring/browser/setup/server/apache.md @@ -117,10 +117,10 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. 1. Locate your Apache httpd binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. 2. Locate the Apache httpd configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. -3. Edit the file by removing the following line at the end: `Include /opt/datadog-httpd/datadog.conf` +3. Edit the file by removing the following line at the end `Include /opt/datadog-httpd/datadog.conf`. 4. Delete the directory `/opt/datadog-httpd/` and all its contents. 5. Finally, restart or reload Apache httpd. diff --git a/content/en/real_user_monitoring/browser/setup/server/ibm.md b/content/en/real_user_monitoring/browser/setup/server/ibm.md index 5b29e34e11921..aa69a65aa3dc6 100644 --- a/content/en/real_user_monitoring/browser/setup/server/ibm.md +++ b/content/en/real_user_monitoring/browser/setup/server/ibm.md @@ -121,10 +121,10 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. 1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. 2. Locate the IBM HTTP Server configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. -3. Edit the file by removing the following line at the end: `Include /opt/datadog-httpd/datadog.conf` +3. Edit the file by removing the following line at the end `Include /opt/datadog-httpd/datadog.conf`. 4. Delete the directory `/opt/datadog-httpd/` and all its contents. 5. Finally, restart or reload IBM HTTP Server. diff --git a/content/en/real_user_monitoring/browser/setup/server/nginx.md b/content/en/real_user_monitoring/browser/setup/server/nginx.md index a842789d68507..37e2421f65b95 100644 --- a/content/en/real_user_monitoring/browser/setup/server/nginx.md +++ b/content/en/real_user_monitoring/browser/setup/server/nginx.md @@ -126,19 +126,16 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps: +While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. 1. Locate the NGINX configuration file by running `nginx -T`. Example: `/etc/nginx/nginx.conf`. -2. Edit the file by removing the following line at the beginning: `load_module /opt/datadog-nginx/ngx_http_datadog_module.so;` -3. Edit the file by removing all existing `datadog_*` sections from within the `http` directive. They will look similar to these, depending on your system configuration: +2. Edit the file by removing the following line at the beginning `load_module /opt/datadog-nginx/ngx_http_datadog_module.so;`. +3. Edit the file by removing all existing `datadog_*` sections from within the `http` directive. They will look similar to these, depending on your system configuration. ``` datadog_agent_url http://datadog-agent:8126; - datadog_tracing off; - datadog_rum on; - datadog_rum_config { # ... specific RUM configuration } From ffe36300106347fbd01e19958d4d47b694349893 Mon Sep 17 00:00:00 2001 From: pablomartinezbernardo <134320516+pablomartinezbernardo@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:36:34 +0200 Subject: [PATCH 3/5] Apply suggestions from code review Co-authored-by: Rosa Trieu <107086888+rtrieu@users.noreply.github.com> --- .../browser/setup/server/apache.md | 12 ++++++------ .../real_user_monitoring/browser/setup/server/ibm.md | 12 ++++++------ .../browser/setup/server/nginx.md | 12 ++++++------ .../browser/setup/server/windows_iis.md | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/content/en/real_user_monitoring/browser/setup/server/apache.md b/content/en/real_user_monitoring/browser/setup/server/apache.md index d771df8ee17fb..3d0fc199d73c3 100644 --- a/content/en/real_user_monitoring/browser/setup/server/apache.md +++ b/content/en/real_user_monitoring/browser/setup/server/apache.md @@ -117,10 +117,10 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. +To manually remove RUM from your auto-instrumented web server: -1. Locate your Apache httpd binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. -2. Locate the Apache httpd configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. -3. Edit the file by removing the following line at the end `Include /opt/datadog-httpd/datadog.conf`. -4. Delete the directory `/opt/datadog-httpd/` and all its contents. -5. Finally, restart or reload Apache httpd. +1. Locate your Apache httpd binary file. It may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. +2. Locate the Apache httpd configuration file by running `httpd -V`. For example: `/usr/local/apache2/conf/httpd.conf`. +3. At the end of the httpd configuration file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. +4. Delete the directory `/opt/datadog-httpd/` and all of its contents. +5. Restart or reload Apache httpd. diff --git a/content/en/real_user_monitoring/browser/setup/server/ibm.md b/content/en/real_user_monitoring/browser/setup/server/ibm.md index aa69a65aa3dc6..4b1f4c4984f72 100644 --- a/content/en/real_user_monitoring/browser/setup/server/ibm.md +++ b/content/en/real_user_monitoring/browser/setup/server/ibm.md @@ -121,10 +121,10 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. +To manually remove the RUM Auto-Instrumentation: -1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. `httpd` will be used for illustration purposes. -2. Locate the IBM HTTP Server configuration file by running `httpd -V`. Example: `/usr/local/apache2/conf/httpd.conf`. -3. Edit the file by removing the following line at the end `Include /opt/datadog-httpd/datadog.conf`. -4. Delete the directory `/opt/datadog-httpd/` and all its contents. -5. Finally, restart or reload IBM HTTP Server. +1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. +2. Locate the IBM HTTP Server configuration file by running `httpd -V`. For example: `/usr/local/apache2/conf/httpd.conf`. +3. At the end of the file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. +4. Delete the directory `/opt/datadog-httpd/` and all of its contents. +5. Restart or reload the IBM HTTP Server. diff --git a/content/en/real_user_monitoring/browser/setup/server/nginx.md b/content/en/real_user_monitoring/browser/setup/server/nginx.md index 37e2421f65b95..dcbc29265e471 100644 --- a/content/en/real_user_monitoring/browser/setup/server/nginx.md +++ b/content/en/real_user_monitoring/browser/setup/server/nginx.md @@ -126,11 +126,11 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -While automatic uninstallation will be available soon, you can manually remove the RUM Auto-Instrumentation by following these steps. +To manually remove RUM from your auto-instrumented web server: -1. Locate the NGINX configuration file by running `nginx -T`. Example: `/etc/nginx/nginx.conf`. -2. Edit the file by removing the following line at the beginning `load_module /opt/datadog-nginx/ngx_http_datadog_module.so;`. -3. Edit the file by removing all existing `datadog_*` sections from within the `http` directive. They will look similar to these, depending on your system configuration. +1. Locate the NGINX configuration file by running `nginx -T`. For example: `/etc/nginx/nginx.conf`. +2. At the beginning of the file, remove the line: `load_module /opt/datadog-nginx/ngx_http_datadog_module.so;`. +3. In the file, remove all existing `datadog_*` sections from within the `http` directive. The sections look similar to the following, depending on your system configuration: ``` datadog_agent_url http://datadog-agent:8126; @@ -141,8 +141,8 @@ While automatic uninstallation will be available soon, you can manually remove t } ``` -4. Delete the directory `/opt/datadog-nginx/` and all its contents. -5. Finally, restart or reload NGINX. +4. Delete the directory `/opt/datadog-nginx/` and all of its contents. +5. Restart or reload your NGINX web server. ## Reference diff --git a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md index d2ebd202f828c..124c5c7919b25 100644 --- a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md +++ b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md @@ -82,4 +82,4 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -Completely uninstall RUM Auto-Instrumentation by uninstalling Datadog RUM from Windows' Apps & features. +To completely remove RUM Auto-Instrumentation, uninstall Datadog RUM using Windows' Apps & Features tool. From d175b3c37a20f9ede692a05831320454ec9c4b33 Mon Sep 17 00:00:00 2001 From: pablomartinezbernardo <134320516+pablomartinezbernardo@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:37:15 +0200 Subject: [PATCH 4/5] Update content/en/real_user_monitoring/browser/setup/server/ibm.md --- content/en/real_user_monitoring/browser/setup/server/ibm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/real_user_monitoring/browser/setup/server/ibm.md b/content/en/real_user_monitoring/browser/setup/server/ibm.md index 4b1f4c4984f72..9988909c718b7 100644 --- a/content/en/real_user_monitoring/browser/setup/server/ibm.md +++ b/content/en/real_user_monitoring/browser/setup/server/ibm.md @@ -121,7 +121,7 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -To manually remove the RUM Auto-Instrumentation: +To manually remove RUM from your auto-instrumented web server: 1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. 2. Locate the IBM HTTP Server configuration file by running `httpd -V`. For example: `/usr/local/apache2/conf/httpd.conf`. From ee774f45721d789a70925a63bc6972bb125b7e0d Mon Sep 17 00:00:00 2001 From: pablomartinezbernardo <134320516+pablomartinezbernardo@users.noreply.github.com> Date: Mon, 21 Apr 2025 10:01:14 +0200 Subject: [PATCH 5/5] Apply suggestions from code review Sorry for the delay, was OOO for a while there Co-authored-by: Rosa Trieu <107086888+rtrieu@users.noreply.github.com> --- .../real_user_monitoring/browser/setup/server/apache.md | 9 ++++----- .../en/real_user_monitoring/browser/setup/server/ibm.md | 9 ++++----- .../browser/setup/server/windows_iis.md | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/content/en/real_user_monitoring/browser/setup/server/apache.md b/content/en/real_user_monitoring/browser/setup/server/apache.md index 3d0fc199d73c3..144ca47c6a4a2 100644 --- a/content/en/real_user_monitoring/browser/setup/server/apache.md +++ b/content/en/real_user_monitoring/browser/setup/server/apache.md @@ -119,8 +119,7 @@ If you notice that RUM is not being injected into HTML pages, consider the follo To manually remove RUM from your auto-instrumented web server: -1. Locate your Apache httpd binary file. It may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. -2. Locate the Apache httpd configuration file by running `httpd -V`. For example: `/usr/local/apache2/conf/httpd.conf`. -3. At the end of the httpd configuration file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. -4. Delete the directory `/opt/datadog-httpd/` and all of its contents. -5. Restart or reload Apache httpd. +1. Locate the Apache (`httpd`) configuration file by running `httpd -V`. Depending on the Linux distribution used, this binary file could be named `http`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. In this instance, the file location could be: `/usr/local/apache2/conf/httpd.conf`. +2. At the end of the httpd configuration file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. +3. Delete the directory `/opt/datadog-httpd/` and all of its contents. +4. Restart or reload Apache httpd. diff --git a/content/en/real_user_monitoring/browser/setup/server/ibm.md b/content/en/real_user_monitoring/browser/setup/server/ibm.md index 9988909c718b7..0d09ab16e0a65 100644 --- a/content/en/real_user_monitoring/browser/setup/server/ibm.md +++ b/content/en/real_user_monitoring/browser/setup/server/ibm.md @@ -123,8 +123,7 @@ If you notice that RUM is not being injected into HTML pages, consider the follo To manually remove RUM from your auto-instrumented web server: -1. Locate your IBM HTTP Server binary, it may be one of `httpd`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. -2. Locate the IBM HTTP Server configuration file by running `httpd -V`. For example: `/usr/local/apache2/conf/httpd.conf`. -3. At the end of the file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. -4. Delete the directory `/opt/datadog-httpd/` and all of its contents. -5. Restart or reload the IBM HTTP Server. +1. Locate the IBM HTTP server (`httpd`) configuration file by running `httpd -V`. Depending on the Linux distribution used, this binary file could be named `http`, `apachectl`, `apache2` or `apache2ctl`. The following steps use `httpd` as an example. In this instance, the file location could be: `/usr/local/apache2/conf/httpd.conf`. +2. At the end of the file, remove the line: `Include /opt/datadog-httpd/datadog.conf`. +3. Delete the directory `/opt/datadog-httpd/` and all of its contents. +4. Restart or reload the IBM HTTP Server. diff --git a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md index 124c5c7919b25..a479f69b3f402 100644 --- a/content/en/real_user_monitoring/browser/setup/server/windows_iis.md +++ b/content/en/real_user_monitoring/browser/setup/server/windows_iis.md @@ -82,4 +82,4 @@ If you notice that RUM is not being injected into HTML pages, consider the follo ## Uninstall -To completely remove RUM Auto-Instrumentation, uninstall Datadog RUM using Windows' Apps & Features tool. +To completely remove RUM Auto-Instrumentation, uninstall Datadog RUM using the Windows Apps & Features tool.