Skip to content

Commit

Permalink
Merge branch 'master' into dashboardsjmx
Browse files Browse the repository at this point in the history
  • Loading branch information
ralongit authored Dec 9, 2024
2 parents 86aad59 + a7dee24 commit db1e4a3
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 8 deletions.
10 changes: 10 additions & 0 deletions docs/_include/general-shipping/k8s.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@ logzio-monitoring logzio-helm/logzio-monitoring

Encounter an issue? See our [troubleshooting guide](https://docs.logz.io/docs/user-guide/log-management/troubleshooting/troubleshooting-fluentd-for-kubernetes-logs/).

### Adding pod labels

To ensure that labels are applied correctly to the pods managed by the Logz.io collector, add the following section to your Helm chart configuration:

```yaml
logzio-k8s-telemetry:
standaloneCollector:
podLabels:
team: devops-tooling
```
### Custom Configuration
Expand Down
12 changes: 6 additions & 6 deletions docs/shipping/Code/node-js.md
Original file line number Diff line number Diff line change
Expand Up @@ -403,9 +403,9 @@ If you need an example aplication to test this integration, please refer to our
Update the `listener.logz.io` part in `https://otlp-listener.logz.io/v1/logs` with the URL for [your hosting region](https://docs.logz.io/docs/user-guide/admin/hosting-regions/account-region).


:::note
If your Logz.io account region is not `us-east-1`, add your [region code](https://docs.logz.io/docs/user-guide/admin/hosting-regions/ account-region/#available-regions) to the `url` like so `https://otlp-listener-<<REGION-CODE>>.logz.io/v1/logs`.
:::
:::note
If your Logz.io account region is not `us-east-1`, add your [region code](https://docs.logz.io/docs/user-guide/admin/hosting-regions/ account-region/#available-regions) to the `url` like so `https://otlp-listener-<<REGION-CODE>>.logz.io/v1/logs`.
:::

3. Run the application.

Expand Down Expand Up @@ -477,9 +477,9 @@ This integration uses the OpenTelemetry logging exporter to send logs to Logz.io
Update the `listener.logz.io` part in `https://otlp-listener.logz.io/v1/logs` with the URL for [your hosting region](https://docs.logz.io/docs/user-guide/admin/hosting-regions/account-region).


:::note
If your Logz.io account region is not `us-east-1`, add your [region code](https://docs.logz.io/docs/user-guide/admin/hosting-regions/ account-region/#available-regions) to the `url` like so `https://otlp-listener-<<REGION-CODE>>.logz.io/v1/logs`.
:::
:::note
If your Logz.io account region is not `us-east-1`, add your [region code](https://docs.logz.io/docs/user-guide/admin/hosting-regions/ account-region/#available-regions) to the `url` like so `https://otlp-listener-<<REGION-CODE>>.logz.io/v1/logs`.
:::

3. Once you have configured the logger, import it into your application (e.g., `server.ts`) and start logging.

Expand Down
2 changes: 0 additions & 2 deletions docs/user-guide/admin/data-tiers/warm-tier.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Warm tier is a storage option designed for data that is not frequently accessed
Warm tier configuration can be set up by contacting the [Sales team](https://logz.io/contact-us/).
:::

Prerequisites

Data gets to warm only after it's been to hot. All hot data goes to warm data according to the retention period configured by you. When you enable Warm Tier, the retention minimum for Hot tier is 4 days.

## Setting Up the Warm Tier
Expand Down
19 changes: 19 additions & 0 deletions docs/user-guide/admin/hosting-regions/account-region.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,25 @@ Your listener host and API host will always be in the same region as your accoun
|Europe (Frankfurt)|AWS|app-eu.logz.io|listener-eu.logz.io|api-eu.logz.io|eu|eu-central-1|
|Europe (London)|AWS|app-uk.logz.io|listener-uk.logz.io|api-uk.logz.io|uk|eu-west-2|

## OpenTelemetry Protocol (OTLP) regions


When using the OpenTelemetry Protocol (OTLP) to send **log data** to Logz.io, it’s essential to use the appropriate regional endpoint. This ensures compliance with data residency requirements and enhances performance.

Configure your setup with the correct endpoint URL for your region and include your Logz.io token in the configuration file.


| Region | Logz.io account host | Listener host | Region code | Region slug |
|---|---|---|---|---|
|US East (Northern Virginia)|app.logz.io|otlp-listener.logz.io/v1/logs|us | us-east-1|
|Asia Pacific (Sydney)|app-au.logz.io|otlp-listener-au.logz.io/v1/logs|au|ap-southeast-2|
|Canada (Central) |app-ca.logz.io|otlp-listener-ca.logz.io/v1/logs |ca|ca-central-1|
|Europe (Frankfurt) |app-eu.logz.io|otlp-listener-eu.logz.io/v1/logs|eu|eu-central-1|
|Europe (London) |app-uk.logz.io|otlp-listener-uk.logz.io/v1/logs|uk|eu-west-2|




## Supported regions for Prometheus metrics


Expand Down

0 comments on commit db1e4a3

Please sign in to comment.