diff --git a/_source/_includes/general-shipping/agent-note.md b/_source/_includes/general-shipping/agent-note.md
new file mode 100644
index 000000000..420622d1d
--- /dev/null
+++ b/_source/_includes/general-shipping/agent-note.md
@@ -0,0 +1,4 @@
+<!-- info-box-start:info -->
+Try out the [Telemetry collector](https://app.logz.io/#/dashboard/send-your-data/agent/new) to quickly and easily collect logs, metrics and traces at the same time.
+{:.info-box.tip}
+<!-- info-box-end -->
diff --git a/_source/logzio_collections/_log-sources/aks.md b/_source/logzio_collections/_log-sources/aks.md
index 18b51b801..c0dd24a89 100644
--- a/_source/logzio_collections/_log-sources/aks.md
+++ b/_source/logzio_collections/_log-sources/aks.md
@@ -33,6 +33,9 @@ order: 470
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Fluentd is an open source data collector and a great option because of its flexibility. This implementation uses a Fluentd DaemonSet to collect Kubernetes logs and send them to Logz.io. The Kubernetes DaemonSet ensures that some or all nodes run a copy of a pod.
 
 
diff --git a/_source/logzio_collections/_log-sources/elastic-kubernetes-service.md b/_source/logzio_collections/_log-sources/elastic-kubernetes-service.md
index a890f6131..1f65700a9 100644
--- a/_source/logzio_collections/_log-sources/elastic-kubernetes-service.md
+++ b/_source/logzio_collections/_log-sources/elastic-kubernetes-service.md
@@ -34,6 +34,9 @@ order: 250
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Fluentd is an open source data collector and a great option because of its flexibility. This implementation uses a Fluentd DaemonSet to collect Kubernetes logs and send them to Logz.io. The Kubernetes DaemonSet ensures that some or all nodes run a copy of a pod.
 
 
diff --git a/_source/logzio_collections/_log-sources/filebeat-kubernetes.md b/_source/logzio_collections/_log-sources/filebeat-kubernetes.md
index 1c97a6a0d..2b598ee7d 100644
--- a/_source/logzio_collections/_log-sources/filebeat-kubernetes.md
+++ b/_source/logzio_collections/_log-sources/filebeat-kubernetes.md
@@ -25,6 +25,8 @@ order: 310
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
 
 This implementation uses a Filebeat DaemonSet to collect Kubernetes logs from your cluster and ship them to Logz.io.
 
diff --git a/_source/logzio_collections/_log-sources/fluentbit-helm-chart.md b/_source/logzio_collections/_log-sources/fluentbit-helm-chart.md
index e5202534b..e898fa934 100644
--- a/_source/logzio_collections/_log-sources/fluentbit-helm-chart.md
+++ b/_source/logzio_collections/_log-sources/fluentbit-helm-chart.md
@@ -19,6 +19,8 @@ order: 430
 
 # Logzio Fluent Bit Helm chart
 
+{% include /general-shipping/agent-note.md %}
+
 
 Fluent Bit is an open source Log Processor and Forwarder which allows you to collect any data like metrics and logs from different sources. Helm is a tool for managing packages of pre-configured Kubernetes resources using Charts. You can use this Helm chart to ship Kubernetes logs to Logz.io with Fluent Bit. 
 
diff --git a/_source/logzio_collections/_log-sources/fluentd-helm.md b/_source/logzio_collections/_log-sources/fluentd-helm.md
index 065c7ccde..c1c7e4cc0 100644
--- a/_source/logzio_collections/_log-sources/fluentd-helm.md
+++ b/_source/logzio_collections/_log-sources/fluentd-helm.md
@@ -27,8 +27,12 @@ order: 180
 
 <!-- tab:start -->
 <div id="overview">
+
 ### Logzio-fluentd
 
+{% include /general-shipping/agent-note.md %}
+
+
 [Helm](https://helm.sh/) is a tool for managing packages of pre-configured Kubernetes resources using Charts.
 Logzio-fluentd allows you to ship logs from your Kubernetes cluster to Logz.io, using Fluentd.
 Fluentd is flexible enough and has the proper plugins to distribute logs to different third parties such as Logz.io.
diff --git a/_source/logzio_collections/_log-sources/iks.md b/_source/logzio_collections/_log-sources/iks.md
index 8417a2e9d..a60671cd5 100644
--- a/_source/logzio_collections/_log-sources/iks.md
+++ b/_source/logzio_collections/_log-sources/iks.md
@@ -30,6 +30,9 @@ order: 1010
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Fluentd is an open source data collector and a great option because of its flexibility. This implementation uses a Fluentd DaemonSet to collect Kubernetes logs and send them to Logz.io. The Kubernetes DaemonSet ensures that some or all nodes run a copy of a pod.
 
 
diff --git a/_source/logzio_collections/_log-sources/k8s-events.md b/_source/logzio_collections/_log-sources/k8s-events.md
index a1c3ce2b1..6f688b658 100644
--- a/_source/logzio_collections/_log-sources/k8s-events.md
+++ b/_source/logzio_collections/_log-sources/k8s-events.md
@@ -16,6 +16,9 @@ order: 160
 
 #### Shipping Kubernetes events
 
+{% include /general-shipping/agent-note.md %}
+
+
 Kubernetes events are a resource type that Kubernetes automatically creates when other resources get state changes, errors, or other messages that should be shared across the system.
 
 This guide uses the [kubernetes-event-exporter](https://github.com/opsgenie/kubernetes-event-exporter) tool to ship kubernetes events to Logz.io.
diff --git a/_source/logzio_collections/_log-sources/k8s-over-helm.md b/_source/logzio_collections/_log-sources/k8s-over-helm.md
index 18dee2dfc..c402b1c8e 100644
--- a/_source/logzio_collections/_log-sources/k8s-over-helm.md
+++ b/_source/logzio_collections/_log-sources/k8s-over-helm.md
@@ -33,6 +33,9 @@ order: 430
 
 ###### Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 You can use a Helm chart to ship k8s logs to Logz.io via Filebeat from Linux and Windows nodes.
 
 Helm is a tool for managing packages of pre-configured Kubernetes resources using Charts.
diff --git a/_source/logzio_collections/_log-sources/kubernetes.md b/_source/logzio_collections/_log-sources/kubernetes.md
index 7f18503ec..f76cbbf5d 100644
--- a/_source/logzio_collections/_log-sources/kubernetes.md
+++ b/_source/logzio_collections/_log-sources/kubernetes.md
@@ -35,6 +35,9 @@ order: 140
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Fluentd is an open source data collector and a great option because of its flexibility. This implementation uses a Fluentd DaemonSet to collect Kubernetes logs and send them to Logz.io. The Kubernetes DaemonSet ensures that some or all nodes run a copy of a pod.
 
 
diff --git a/_source/logzio_collections/_log-sources/openshift.md b/_source/logzio_collections/_log-sources/openshift.md
index 70be43d81..e8d4ebaf2 100644
--- a/_source/logzio_collections/_log-sources/openshift.md
+++ b/_source/logzio_collections/_log-sources/openshift.md
@@ -26,6 +26,9 @@ order: 10
 <!-- tab:start -->
 <div id="default">
 
+{% include /general-shipping/agent-note.md %}
+
+
 OpenShift is a family of containerization software products developed by Red Hat. Deploy this integration to ship logs from your OpenShift cluster to Logz.io. Deploy this integration to ship logs from your OpenShift cluster to Logz.io. This integration will deploy the default daemonset, which sends only container logs while ignoring all containers with "openshift" namespace.
 
 **Before you begin, you'll need**:
diff --git a/_source/logzio_collections/_log-sources/oracle-kubernetes-engine.md b/_source/logzio_collections/_log-sources/oracle-kubernetes-engine.md
index b50ec484d..c09cc6d23 100644
--- a/_source/logzio_collections/_log-sources/oracle-kubernetes-engine.md
+++ b/_source/logzio_collections/_log-sources/oracle-kubernetes-engine.md
@@ -24,6 +24,9 @@ order: 1030
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 
 Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE) is a fully-managed, scalable, and highly available service that you can use to deploy your containerized applications to the cloud.
 
diff --git a/_source/logzio_collections/_log-sources/rds.md b/_source/logzio_collections/_log-sources/rds.md
index 6a777979a..77d577a3a 100644
--- a/_source/logzio_collections/_log-sources/rds.md
+++ b/_source/logzio_collections/_log-sources/rds.md
@@ -113,6 +113,9 @@ If you still don't see your logs, see [log shipping troubleshooting]({{site.base
 
 #### Deploying logzio-mysql-logs directly via Kubernetes
 
+{% include /general-shipping/agent-note.md %}
+
+
 **Before you begin, you'll need**:
 
 * MySQL database hosted on Amazon RDS
diff --git a/_source/logzio_collections/_log-sources/windows.md b/_source/logzio_collections/_log-sources/windows.md
index 77e1b19fd..c43ee60ac 100644
--- a/_source/logzio_collections/_log-sources/windows.md
+++ b/_source/logzio_collections/_log-sources/windows.md
@@ -27,6 +27,9 @@ order: 100
 
 #### Configure Winlogbeat
 
+{% include /general-shipping/agent-note.md %}
+
+
 **Before you begin, you'll need**:
 [Winlogbeat 7](https://www.elastic.co/guide/en/beats/winlogbeat/7.x/winlogbeat-installation-configuration.html#installation) or
 [Winlogbeat 6](https://www.elastic.co/guide/en/beats/winlogbeat/6.8/winlogbeat-installation.html)
diff --git a/_source/logzio_collections/_prometheus-sources/dotnet-helm-chart.md b/_source/logzio_collections/_prometheus-sources/dotnet-helm-chart.md
index 1dcbbbf01..3717af79f 100644
--- a/_source/logzio_collections/_prometheus-sources/dotnet-helm-chart.md
+++ b/_source/logzio_collections/_prometheus-sources/dotnet-helm-chart.md
@@ -27,6 +27,9 @@ order: 430
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Helm is a tool for managing packages of pre-configured Kubernetes resources using Charts. This integration allows you to collect and ship diagnostic metrics of your .NET application in Kubernetes to Logz.io, using dotnet-monitor and OpenTelemetry. logzio-dotnet-monitor runs as a sidecar in the same pod as the .NET application.
 
 ###### Sending metrics from nodes with taints
diff --git a/_source/logzio_collections/_prometheus-sources/otel-metrics-aks-helm.md b/_source/logzio_collections/_prometheus-sources/otel-metrics-aks-helm.md
index cf17ff515..258a01d2b 100644
--- a/_source/logzio_collections/_prometheus-sources/otel-metrics-aks-helm.md
+++ b/_source/logzio_collections/_prometheus-sources/otel-metrics-aks-helm.md
@@ -34,6 +34,8 @@ order: 390
 
 ####  Overview
 
+{% include /general-shipping/agent-note.md %}
+
 
 **logzio-k8s-telemetry** allows you to ship metrics from your Kubernetes cluster to Logz.io with the OpenTelemetry collector.
 For AKS clusters, this chart also allows you to ship Windows node metrics.
diff --git a/_source/logzio_collections/_prometheus-sources/otel-metrics-eks-helm.md b/_source/logzio_collections/_prometheus-sources/otel-metrics-eks-helm.md
index 82c3b4c6f..15c57777b 100644
--- a/_source/logzio_collections/_prometheus-sources/otel-metrics-eks-helm.md
+++ b/_source/logzio_collections/_prometheus-sources/otel-metrics-eks-helm.md
@@ -33,6 +33,8 @@ order: 390
 
 ####  Overview
 
+{% include /general-shipping/agent-note.md %}
+
 
 **logzio-k8s-telemetry** allows you to ship metrics from your Kubernetes cluster to Logz.io with the OpenTelemetry collector.
 
diff --git a/_source/logzio_collections/_prometheus-sources/otel-metrics-gke-helm.md b/_source/logzio_collections/_prometheus-sources/otel-metrics-gke-helm.md
index 1c6d3056b..51bac0cab 100644
--- a/_source/logzio_collections/_prometheus-sources/otel-metrics-gke-helm.md
+++ b/_source/logzio_collections/_prometheus-sources/otel-metrics-gke-helm.md
@@ -33,6 +33,8 @@ order: 390
 
 ####  Overview
 
+{% include /general-shipping/agent-note.md %}
+
 
 **logzio-k8s-telemetry** allows you to ship metrics from your Kubernetes cluster to Logz.io with the OpenTelemetry collector.
 
diff --git a/_source/logzio_collections/_prometheus-sources/otel-metrics-k8s-helm.md b/_source/logzio_collections/_prometheus-sources/otel-metrics-k8s-helm.md
index 1f81985bd..e6f499b3b 100644
--- a/_source/logzio_collections/_prometheus-sources/otel-metrics-k8s-helm.md
+++ b/_source/logzio_collections/_prometheus-sources/otel-metrics-k8s-helm.md
@@ -33,6 +33,8 @@ order: 390
 
 ####  Overview
 
+{% include /general-shipping/agent-note.md %}
+
 
 **logzio-k8s-telemetry** allows you to ship metrics from your Kubernetes cluster to Logz.io with the OpenTelemetry collector.
 
diff --git a/_source/logzio_collections/_prometheus-sources/telegraf-argo.md b/_source/logzio_collections/_prometheus-sources/telegraf-argo.md
index eaa920006..97ce6da37 100644
--- a/_source/logzio_collections/_prometheus-sources/telegraf-argo.md
+++ b/_source/logzio_collections/_prometheus-sources/telegraf-argo.md
@@ -18,6 +18,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes. Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format Argo CD metrics to Logz.io, you need to add the **inputs.prometheus** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/telegraf-etcd.md b/_source/logzio_collections/_prometheus-sources/telegraf-etcd.md
index 8bfa0c8be..501e08d37 100644
--- a/_source/logzio_collections/_prometheus-sources/telegraf-etcd.md
+++ b/_source/logzio_collections/_prometheus-sources/telegraf-etcd.md
@@ -18,6 +18,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 etcd is an open source, distributed, consistent key-value store for shared configuration, service discovery, and scheduler coordination of distributed systems or clusters of machines. Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format etcd metrics to Logz.io, you need to add the **inputs.prometheus** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/telegraf-sysmetrics.md b/_source/logzio_collections/_prometheus-sources/telegraf-sysmetrics.md
index bce1eaf88..fab15f815 100644
--- a/_source/logzio_collections/_prometheus-sources/telegraf-sysmetrics.md
+++ b/_source/logzio_collections/_prometheus-sources/telegraf-sysmetrics.md
@@ -17,6 +17,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format System metrics to Logz.io, you need to add multiple system-related inputs and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/telegraf-windows-performance.md b/_source/logzio_collections/_prometheus-sources/telegraf-windows-performance.md
index c3cc9b8aa..4ce9c666b 100644
--- a/_source/logzio_collections/_prometheus-sources/telegraf-windows-performance.md
+++ b/_source/logzio_collections/_prometheus-sources/telegraf-windows-performance.md
@@ -17,6 +17,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format Windows Performance metrics to Logz.io, you need to add the **inputs.win_perf_counters** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/telegraf-windows.md b/_source/logzio_collections/_prometheus-sources/telegraf-windows.md
index bad510f70..712dc83b8 100644
--- a/_source/logzio_collections/_prometheus-sources/telegraf-windows.md
+++ b/_source/logzio_collections/_prometheus-sources/telegraf-windows.md
@@ -17,6 +17,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format Windows Services metrics to Logz.io, you need to add the **inputs.win_services** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/vpc.md b/_source/logzio_collections/_prometheus-sources/vpc.md
index 5969aa8ae..4c2d5dbfe 100644
--- a/_source/logzio_collections/_prometheus-sources/vpc.md
+++ b/_source/logzio_collections/_prometheus-sources/vpc.md
@@ -17,6 +17,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Google Virtual Private Cloud (VPC) provides networking functionality to Compute Engine virtual machine (VM) instances, Google Kubernetes Engine (GKE) clusters, and the App Engine flexible environment. Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format Google Virtual Private Cloud (VPC) metrics to Logz.io, you need to add the **inputs.stackdriver** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_prometheus-sources/vpn.md b/_source/logzio_collections/_prometheus-sources/vpn.md
index dfba7b854..a95e8f74c 100644
--- a/_source/logzio_collections/_prometheus-sources/vpn.md
+++ b/_source/logzio_collections/_prometheus-sources/vpn.md
@@ -17,6 +17,9 @@ order: 800
 
 ## Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 Google Cloud VPN provides networking functionality to Compute Engine virtual machine (VM) instances, Google Kubernetes Engine (GKE) clusters, and the App Engine flexible environment. Telegraf is a plug-in driven server agent for collecting and sending metrics and events from databases, systems and IoT sensors.
 
 To send your Prometheus-format Google Cloud VPN metrics to Logz.io, you need to add the **inputs.stackdriver** and **outputs.http** plug-ins to your Telegraf configuration file.
diff --git a/_source/logzio_collections/_security-sources/alcide.md b/_source/logzio_collections/_security-sources/alcide.md
index e6e5f69c9..e6500ec68 100644
--- a/_source/logzio_collections/_security-sources/alcide.md
+++ b/_source/logzio_collections/_security-sources/alcide.md
@@ -18,6 +18,9 @@ identifying abnormal administrative activity and compromised Kubernetes resource
 
 You can review Alcide kAudit findings in your Logz.io security account, including a pre-configured [Alcide dashboard in Logz.io](https://app.logz.io/#/dashboard/security/research/dashboards?) to get you started.
 
+{% include /general-shipping/agent-note.md %}
+
+
 #### Configuration
 
 You can configure an Alcide kAudit integration that uses the Logz.io HTTPS API. The integration can be configured from the kAudit app or kAudit Kubernetes ConfigMap.
diff --git a/_source/logzio_collections/_security-sources/falco.md b/_source/logzio_collections/_security-sources/falco.md
index 55792279d..10de7ebc9 100644
--- a/_source/logzio_collections/_security-sources/falco.md
+++ b/_source/logzio_collections/_security-sources/falco.md
@@ -13,6 +13,9 @@ shipping-tags:
 order: 880
 ---
 
+{% include /general-shipping/agent-note.md %}
+
+
 Falco is a [CNCF-approved](https://www.cncf.io/blog/2020/01/08/toc-votes-to-move-falco-into-cncf-incubator/) container security and Kubernetes threat detection engine that logs illegal container activity at runtime.
 
 Shipping your Falco logs to your Cloud SIEM can help you monitor your Kubernetes workloads for potentially malicious behavior. This can help you catch attempts to remove logging data from a container, to run recon tools inside a container, or add potentially malicious repositories to a container. [Learn more in our blog 🔗](https://logz.io/blog/k8s-security-with-falco-and-cloud-siem/)
diff --git a/_source/logzio_collections/_tracing-sources/dotnet-framework-otel-auto.md b/_source/logzio_collections/_tracing-sources/dotnet-framework-otel-auto.md
index 0db3125ed..0ca742fe6 100644
--- a/_source/logzio_collections/_tracing-sources/dotnet-framework-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/dotnet-framework-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your ASP.NET or .NET Framework application using OpenTelemetry.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/dotnet-otel-auto.md b/_source/logzio_collections/_tracing-sources/dotnet-otel-auto.md
index 8cd927c2e..2df0611a5 100644
--- a/_source/logzio_collections/_tracing-sources/dotnet-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/dotnet-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your ASP.NET Core application using OpenTelemetry.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/go-otel.md b/_source/logzio_collections/_tracing-sources/go-otel.md
index 731e6202d..ab18fd5a7 100644
--- a/_source/logzio_collections/_tracing-sources/go-otel.md
+++ b/_source/logzio_collections/_tracing-sources/go-otel.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable instrumentation of your Go application using OpenTelemetry. 
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/istio-traces.md b/_source/logzio_collections/_tracing-sources/istio-traces.md
index 2464d06b5..5735efa4c 100644
--- a/_source/logzio_collections/_tracing-sources/istio-traces.md
+++ b/_source/logzio_collections/_tracing-sources/istio-traces.md
@@ -13,6 +13,9 @@ shipping-tags:
 order: 1380
 ---
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to send traces from your Istio service mesh layers to Logz.io via the OpenTelemetry collector using **logzio-otel-traces** Helm chart. The main repository for Logz.io helm charts are [logzio-helm](https://github.com/logzio/logzio-helm).
 
 **Before you begin, you'll need**:
diff --git a/_source/logzio_collections/_tracing-sources/java-otel-auto.md b/_source/logzio_collections/_tracing-sources/java-otel-auto.md
index b7f7d396d..928afb09a 100644
--- a/_source/logzio_collections/_tracing-sources/java-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/java-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your Java application using OpenTelemetry.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/nestjs-otel-auto.md b/_source/logzio_collections/_tracing-sources/nestjs-otel-auto.md
index cd8f02ba0..9409871b3 100644
--- a/_source/logzio_collections/_tracing-sources/nestjs-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/nestjs-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your NestJS application using OpenTelemetry. 
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/nodejs-otel-auto.md b/_source/logzio_collections/_tracing-sources/nodejs-otel-auto.md
index 0f26ce663..65e497282 100644
--- a/_source/logzio_collections/_tracing-sources/nodejs-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/nodejs-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your Node.js application using OpenTelemetry. 
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/opentelemetry.md b/_source/logzio_collections/_tracing-sources/opentelemetry.md
index a1b7fdb61..9da34d676 100644
--- a/_source/logzio_collections/_tracing-sources/opentelemetry.md
+++ b/_source/logzio_collections/_tracing-sources/opentelemetry.md
@@ -28,6 +28,9 @@ order: 330
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to send traces from your OpenTelemetry installation to Logz.io.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/otel-traces-helm.md b/_source/logzio_collections/_tracing-sources/otel-traces-helm.md
index 7578d7e12..431b9db47 100644
--- a/_source/logzio_collections/_tracing-sources/otel-traces-helm.md
+++ b/_source/logzio_collections/_tracing-sources/otel-traces-helm.md
@@ -15,6 +15,9 @@ order: 1380
 
 ### Overview
 
+{% include /general-shipping/agent-note.md %}
+
+
 You can use a Helm chart to ship Traces to Logz.io via the OpenTelemetry collector. The Helm tool is used to manage packages of pre-configured Kubernetes resources that use charts.
 
 **logzio-otel-traces** allows you to ship traces from your Kubernetes cluster to Logz.io with the OpenTelemetry collector.
diff --git a/_source/logzio_collections/_tracing-sources/python-otel-auto.md b/_source/logzio_collections/_tracing-sources/python-otel-auto.md
index e6a0223d0..23e049fbe 100644
--- a/_source/logzio_collections/_tracing-sources/python-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/python-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your Python application using OpenTelemetry.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/ruby-otel-auto.md b/_source/logzio_collections/_tracing-sources/ruby-otel-auto.md
index 29b44bd3c..6db827dc8 100644
--- a/_source/logzio_collections/_tracing-sources/ruby-otel-auto.md
+++ b/_source/logzio_collections/_tracing-sources/ruby-otel-auto.md
@@ -26,6 +26,9 @@ order: 1380
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 Deploy this integration to enable automatic instrumentation of your Ruby application using OpenTelemetry.
 
 ### Architecture overview
diff --git a/_source/logzio_collections/_tracing-sources/span-metrics.md b/_source/logzio_collections/_tracing-sources/span-metrics.md
index 3e5699ef0..21a8afde1 100644
--- a/_source/logzio_collections/_tracing-sources/span-metrics.md
+++ b/_source/logzio_collections/_tracing-sources/span-metrics.md
@@ -25,6 +25,9 @@ order: 330
 <!-- tab:start -->
 <div id="overview">
 
+{% include /general-shipping/agent-note.md %}
+
+
 [Service Performance Monitoring](https://docs.logz.io/user-guide/distributed-tracing/service-performance-monitoring) is a high-level monitoring dashboard within Logz.io that enables you to monitor your tracing services and operations. This integration allows you to configure Service Performance Monitoring with OpenTelemetry collector and send spans and span metrics from your OpenTelemetry installation to Logz.io. 
 
 
diff --git a/_source/no-search/archive4safekeeping-tracing/k8s-deployment-with_jaegercollector.md b/_source/no-search/archive4safekeeping-tracing/k8s-deployment-with_jaegercollector.md
index 55a6e0c31..4f540336c 100644
--- a/_source/no-search/archive4safekeeping-tracing/k8s-deployment-with_jaegercollector.md
+++ b/_source/no-search/archive4safekeeping-tracing/k8s-deployment-with_jaegercollector.md
@@ -13,6 +13,8 @@ contributors:
 ---
 If you’re working with Kubernetes, you can use the yaml file below as a reference to deploy the collector/agent and use the output of `kubectl explain deployment` as your **apiVersion** value. This example may not work for all files: Some environments may require you to modify the yaml file.
 
+{% include /general-shipping/agent-note.md %}
+
 #### _Before you begin:_
 
 {:.no_toc}  
diff --git a/_source/no-search/archive4safekeeping-tracing/k8s-deployment_pre-June2021.md b/_source/no-search/archive4safekeeping-tracing/k8s-deployment_pre-June2021.md
index 883fbef63..b36e7420c 100644
--- a/_source/no-search/archive4safekeeping-tracing/k8s-deployment_pre-June2021.md
+++ b/_source/no-search/archive4safekeeping-tracing/k8s-deployment_pre-June2021.md
@@ -13,6 +13,8 @@ contributors:
 ---
 If you’re working with Kubernetes, you can use the yaml file below as a reference to deploy the collector/agent and use the output of `kubectl explain deployment` as your **apiVersion** value. This example may not work for all files: Some environments may require you to modify the yaml file. 
 
+{% include /general-shipping/agent-note.md %}
+
 #### _Before you begin:_
 
 {:.no_toc}  
diff --git a/_source/no-search/archive4safekeeping-tracing/tracing-highlights.md b/_source/no-search/archive4safekeeping-tracing/tracing-highlights.md
index 45a5bd40b..dbbfc4591 100644
--- a/_source/no-search/archive4safekeeping-tracing/tracing-highlights.md
+++ b/_source/no-search/archive4safekeeping-tracing/tracing-highlights.md
@@ -12,6 +12,9 @@ contributors:
 ---
 ### Oh, the Traces You'll Go! 
 
+{% include /general-shipping/agent-note.md %}
+
+
 This section includes the following topics: 
 
 * [Why Distributed Tracing?](/user-guide/distributed-tracing/tracing-overview): An overview of Logz.io's Jaeger-powered tracing solution
diff --git a/_source/user-guide/distributed-tracing/deploying-components.md b/_source/user-guide/distributed-tracing/deploying-components.md
index b6fc6ab54..fd05cff6f 100644
--- a/_source/user-guide/distributed-tracing/deploying-components.md
+++ b/_source/user-guide/distributed-tracing/deploying-components.md
@@ -81,4 +81,7 @@ While you can always refer to the <a href="https://www.jaegertracing.io/docs/lat
 
 ## Kubernetes deployment reference
 
+{% include /general-shipping/agent-note.md %}
+
+
 If you’re working with Kubernetes, use [this yaml file](/user-guide/distributed-tracing/k8s-deployment) as a reference to deploy the collector/agent, and use the output of `kubectl explain deployment` as your **apiVersion** value.
diff --git a/_source/user-guide/distributed-tracing/getting-started-tracing.md b/_source/user-guide/distributed-tracing/getting-started-tracing.md
index 5e49873ea..b72a64f7b 100644
--- a/_source/user-guide/distributed-tracing/getting-started-tracing.md
+++ b/_source/user-guide/distributed-tracing/getting-started-tracing.md
@@ -14,6 +14,8 @@ Get set and get ready: This section describes what you have to do to get set up
 If you already use Distributed Tracing, refer to our [guides on how to get connected to Logz.io](https://app.logz.io/#/dashboard/send-your-data/collection?tag=existing-instrumentation&collection=tracing-sources). <br>
 This information is also available in the [**Logz.io Docs**](https://docs.logz.io/shipping/#tracing-sources), via the **My code is instrumented** filter.
 
+{% include /general-shipping/agent-note.md %}
+
 #### To set up Distributed Tracing: 
 {:.no_toc}  
 
diff --git a/_source/user-guide/distributed-tracing/k8s-deployment.md b/_source/user-guide/distributed-tracing/k8s-deployment.md
index 616c35ee3..a12bf4b15 100644
--- a/_source/user-guide/distributed-tracing/k8s-deployment.md
+++ b/_source/user-guide/distributed-tracing/k8s-deployment.md
@@ -20,6 +20,9 @@ The following guide will walk you through how to get your Tracing account token
 
 The main repository for Logz.io helm charts are [logzio-helm](https://github.com/logzio/logzio-helm).
 
+{% include /general-shipping/agent-note.md %}
+
+
 #### _Send traces from Kubernetes_
 
 {:.no_toc}  
diff --git a/_source/user-guide/distributed-tracing/service-performance-monitoring-setup.md b/_source/user-guide/distributed-tracing/service-performance-monitoring-setup.md
index bf9dfa2f9..3aadddcdf 100644
--- a/_source/user-guide/distributed-tracing/service-performance-monitoring-setup.md
+++ b/_source/user-guide/distributed-tracing/service-performance-monitoring-setup.md
@@ -24,6 +24,7 @@ The first pipeline sends the spans to the Logz.io backend, where you can analyze
 
 The second pipeline extracts the metrics from the same spans, aggregates them, and sends them to Logz.io’s Prometheus-based account.
 
+{% include /general-shipping/agent-note.md %}
 
 
 #### Activate the Service Performance Monitoring dashboard
diff --git a/_source/user-guide/distributed-tracing/tracing-instrumentation.md b/_source/user-guide/distributed-tracing/tracing-instrumentation.md
index 55e870115..e5cada514 100644
--- a/_source/user-guide/distributed-tracing/tracing-instrumentation.md
+++ b/_source/user-guide/distributed-tracing/tracing-instrumentation.md
@@ -15,6 +15,9 @@ contributors:
 
 To collect your Distributed Tracing through Logz.io's **[Telemetry Collector](/user-guide/log-shipping/telemetry-collector.html)**, you’ll have to define auto-instrumentation on your Kubernetes pods manually.
 
+{% include /general-shipping/agent-note.md %}
+
+
 Following the relevant step-by-step auto-instrumentation guide will help you through the process:
 
 
diff --git a/_source/user-guide/infrastructure-monitoring/annotations.md b/_source/user-guide/infrastructure-monitoring/annotations.md
index 94f90a1d9..ca2f26991 100644
--- a/_source/user-guide/infrastructure-monitoring/annotations.md
+++ b/_source/user-guide/infrastructure-monitoring/annotations.md
@@ -15,6 +15,7 @@ Annotations can mark events on your Metrics dashboards based on data from a logg
 
 Annotations offer another way to correlate your metrics with your logs, to help you figure out _why_ things are happening. Annotations are similar to using [Markers]({{site.baseurl}}/user-guide/insights/markers.html) in your logging [Insights]({{site.baseurl}}/user-guide/insights/exploring-insights.html).
 
+{% include /general-shipping/agent-note.md %}
 
 
 #### Configure an annotation
diff --git a/_source/user-guide/infrastructure-monitoring/explore-in-kibana.md b/_source/user-guide/infrastructure-monitoring/explore-in-kibana.md
index 6b1aa3422..1469f1293 100644
--- a/_source/user-guide/infrastructure-monitoring/explore-in-kibana.md
+++ b/_source/user-guide/infrastructure-monitoring/explore-in-kibana.md
@@ -20,6 +20,8 @@ A few dashboards provided out-of-the-box by Logz.io come with **Explore in Kiban
 
 Drilldown links help you go straight to the related logs whenever you identify an issue in your Metrics graphs and see a need to investigate it further. They are a powerful observability tool that gives you context and visibility into the logs that coincided with the Metrics events.
 
+{% include /general-shipping/agent-note.md %}
+
 
 ##### Overview
 {:.no_toc}
diff --git a/_source/user-guide/infrastructure-monitoring/metrics-explore-prometheus.md b/_source/user-guide/infrastructure-monitoring/metrics-explore-prometheus.md
index ab6318597..5754b2820 100644
--- a/_source/user-guide/infrastructure-monitoring/metrics-explore-prometheus.md
+++ b/_source/user-guide/infrastructure-monitoring/metrics-explore-prometheus.md
@@ -19,6 +19,9 @@ contributors:
 
 Metrics Explore is where you can research the data available in your Prometheus metrics account and discover the metadata (tags, dimensions, or fields) associated with each metric from the services in your environment.
 
+{% include /general-shipping/agent-note.md %}
+
+
 It's a bit like Kibana Discover, in that it is optimized for quickly searching the data in preparation for creating dashboards.
 
 Whether you just started sending metrics for the first time, or you want to check that your metrics arrived as expected, the Metrics Explore mode is the best way to do it. It's also great if you're a long-time user and want to examine the structure of your metrics to create a new monitoring dashboard.
diff --git a/_source/user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-k8s.md b/_source/user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-k8s.md
index 20db67bf6..d5e51bce4 100644
--- a/_source/user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-k8s.md
+++ b/_source/user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-k8s.md
@@ -13,6 +13,9 @@ contributors:
 Telemetry Collector is currently **available in all regions** except for Japan and Australia. If you're located in these regions, you can use **[Logz.io’s data shippers](https://app.logz.io/#/dashboard/send-your-data/collection?tag=all&collection=all)** to send your data.
 {:.info-box.note}
 
+{% include /general-shipping/agent-note.md %}
+
+
 To start sending your Kubernetes data through the Telemetry Collector, Log into your Logz.io account, navigate to [Send your data](https://app.logz.io/#/dashboard/send-your-data), and click on **Start collecting**.
 
 
diff --git a/_source/user-guide/log-shipping/telemetry-collector.md b/_source/user-guide/log-shipping/telemetry-collector.md
index 9a0f12067..fcb041c97 100644
--- a/_source/user-guide/log-shipping/telemetry-collector.md
+++ b/_source/user-guide/log-shipping/telemetry-collector.md
@@ -12,9 +12,15 @@ contributors:
 
 Logz.io’s Telemetry Collector lets you quickly send your data based on the configuration that fits your needs. For example, you can use it to send logs, metrics, and tracing data back to Logz.io’s observability platform.
 
+{% include /general-shipping/agent-note.md %}
+
+
 Telemetry Collector is currently **available in all regions** except for Japan and Australia. If you're located in these regions, you can use **[Logz.io’s data shippers](https://app.logz.io/#/dashboard/send-your-data/collection?tag=all&collection=all)** to send your data.
 {:.info-box.note}
 
+{% include /general-shipping/agent-note.md %}
+
+
 #### Why should you use Telemetry Collector?
 
 Configuring and running Logz.io’s Telemetry Collector provides several advantages, including: