more changes

logzio · Oct 3, 2023 · d5894fe · d5894fe
1 parent f9e4214
commit d5894fe
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 38 deletions.
diff --git a/...user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-aws.md b/...user-guide/log-shipping/telemetry-collector-shipping/telemetry-collector-aws.md
@@ -23,7 +23,7 @@ To configure the Telemetry Collector, you must be logged into your **main** Logz
 This integration is only compatible with Amazon Linux version 2 on EC2. The use of version 1 is deprecated.
 {:.info-box.important}
 
-![Start collecting button](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/telemetry-start-here.png)
+![Start collecting button](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/start-collecting-sep.png)
 
 ## Prerequisite
 
@@ -33,42 +33,50 @@ The IAM role assigned to the EC2 instance must include the `ec2:DescribeTags` pe
 
 <div class="tasklist">
 
-##### Select platform
+##### Select your environment
 
 Select the AWS platform and the relevant sub-type through which you want to send your data.
 
-![Select platform](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/aws-agent.png)
+![Select platform](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/collector-main-aws-sep.png)
 
 ##### Select data sources
 
-Enter the full path location of your log files from your machine. You can add multiple files by clicking on the **Add a file** option.
+Each AWS environment requires different elements to collect your data.
 
-Logz.io uses OpenTelemetry to monitor your EC2.
+* **AWS Logs** - Select your region, AWS services, and Custom Log Groups.
+* **AWS Metrics** - Select your region and AWS namespace.
+* **EC2 Monitoring** - Auto collects the data. Logz.io uses OpenTelemetry to monitor your EC2.
 
-![Select data source](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/telemetry-aws-data-source.png)
+![Select data source](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/configure-aws-sep.png)
 
 ##### Define your collector
 
-Choose a name and write a description to help identify the collector. 
+You can edit your collector’s name and description, and choose which Logs, Metrics, and Tracing accounts the data will be sent. If you don’t have active accounts, you’ll be able to review the newly generated account names before continuing.
 
-Under **Accounts**, you can review the Logs and Metrics accounts to which the Telemetry Collector will send the data. If you don't have an existing account, one will be generated for you, and you’ll be able to review its name before continuing.
+Click **Generate collector** to continue.
 
-Click **Generate snippet** to continue.
+![Define collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/define-aws-sep.png)
+
+
+##### _Optional_ - Define your EC2 collector
+
+You can configure the data sources the Telemetry Collector will collect. To do so, after choosing the EC2 Monitoring option, click on Advance settings at the top of the page. Next, you can edit and change the location of your logs, and whether you want to monitor both logs and metrics. 
+
+
+![configure ec2 data source](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/configure-ec2-sep.png)
 
-![Define collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/telemetry-aws-define.png)
 
 ##### Install the Telemetry Collector
 
-Copy the code snippet and **run it in your EC2** to install the AWS Telemetry Collector.
+
+Login to your AWS account, launch AWS stack to run stack configuration, and click on the Run AWS stack button to activate your collector. 
 
 Some platforms might require additional details, such as admin privileges or passwords, to complete the installation. These details are not sent to or stored by Logz.io.
 {:.info-box.note}
 
-![Review collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/collector-localhost-finish.png)
-
-##### Collect data
+![Review collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/activate-aws-sep.png)
 
-That’s it! It might take a while for the Telemetry Collector to get up and running, after which you’ll be able to view your logs, metrics, or traces and get full observability into your system.
+It might take a while for the Telemetry Collector to get up and running, after which you’ll be able to view your logs, metrics, or traces and get full observability into your system.
 
 </div>
 

diff --git a/...uide/log-shipping/telemetry-collector-shipping/telemetry-collector-localhost.md b/...uide/log-shipping/telemetry-collector-shipping/telemetry-collector-localhost.md
@@ -19,52 +19,49 @@ To configure the Telemetry Collector, you must be logged into your **main** Logz
 {:.info-box.important}
 
 
-![Start collecting button](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/telemetry-start-here.png)
+![Start collecting button](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/start-collecting-sep.png)
 
 
 <div class="tasklist">
 
-##### Select platform
+##### Select your environment
 
-Select the Localhost platform and the relevant sub-type through which you want to send your data.
+Select the your preferred Localhost platform through which you want to send your data.
 
-![Localhost select platform](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/tc-select-localhost.png)
+![Localhost select platform](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/collector-localhost-sep.png)
 
-##### Select data sources
 
+##### Activate your collector
 
-Enter the full path location of your log folders from your machine. You can add multiple log folders or files by clicking on the **Add a folder**/**Add a file** option.
-
-The Telemetry Collector can also collect metrics data from your logs.
+Copy the code snippet and run it on your end:
 
-![Select folder collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/log-location.png)
+* **Windows** users - Run the snippet in your PowerShell x64 **as Administrator** (Note that PowerShell x86 and PowerShell ISE are currently not supported).
+* **Linux** and **Mac** users - Run the snippet in your terminal. Note that your Bash version should be **4.0** or higher.
 
-If you're running on a **Windows** machine, you'll be able to choose whether you want to collect application, security, and system logs.
+Some platforms might require additional details, such as admin privileges or passwords, to complete the installation. These details are not sent to or stored by Logz.io.
 
-##### Define your collector
+![Review collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/activate-collector-localhost-sep.png)
 
-Choose a name and write a description to help identify the collector. 
+It might take a while for the Telemetry Collector to get up and running, after which you’ll be able to view your logs or metrics and get full observability into your system.
 
-Under **Accounts**, you can review the Logs and Metrics accounts to which the Telemetry Collector will send the data. If you don’t have an existing account, one will be created for you, and you’ll be able to review its name before continuing.
+##### _Optional_ - Select data sources
 
-Click **Generate snippet** to continue.
+You can configure the data sources the Telemetry Collector will collect. To do so, click on Advance settings at the top of the page. Next, you can edit and change telemetries will be collected by Logz.io.
 
-![Define collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/define-collector-localhost.png)
+You can edit the path location of your log folders from your machine, and choose which telemetries you want to collect.
 
-##### Run the Telemetry Collector
+![Select folder collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/configure-localhost-sep.png)
 
-Copy the code snippet and run it on your end:
+If you're running on a **Windows** machine, you'll be able to choose whether you want to collect application, security, and system logs.
 
-* **Mac** and **Linux** users - Run the snippet in your terminal.
-* **Windows** users - Run the snippet in your PowerShell x64 **as Administrator** (Note that PowerShell x86 and PowerShell ISE are currently not supported).
+##### _Optional_ - Define your collector
 
-Some platforms might require additional details, such as admin privileges or passwords, to complete the installation. These details are not sent to or stored by Logz.io.
+You can edit your collector’s name and description, and choose which Logs, Metrics, and Tracing accounts the data will be sent. If you don’t have active accounts, you’ll be able to review the newly generated account names before continuing.
 
-![Review collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/collector-localhost-finish.png)
+Click **Save changes** to continue.
 
-##### Collect data
+![Define collector](https://dytvr9ot2sszz.cloudfront.net/logz-docs/telemetry-agent/define-localhost-sep.png)
 
-That’s it! It might take a while for the Telemetry Collector to get up and running, after which you’ll be able to view your logs or metrics and get full observability into your system.
 
 </div>