From 6f9db20023ac1c35b05c1b4cc255c8d2abe06887 Mon Sep 17 00:00:00 2001 From: Michael Thamm Date: Mon, 30 Mar 2026 12:42:58 -0400 Subject: [PATCH 1/2] chore: Link fixes --- docs/explanation/logging-architecture.md | 2 +- docs/explanation/telemetry-labels.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/explanation/logging-architecture.md b/docs/explanation/logging-architecture.md index 7182e9c4..6aafbb28 100644 --- a/docs/explanation/logging-architecture.md +++ b/docs/explanation/logging-architecture.md @@ -249,8 +249,8 @@ The default retention period is 30 days. At the moment the loki charmed operator ## References -- [Collect logs with Promtail](https://grafana.com/docs/grafana-cloud/send-data/logs/collect-logs-with-promtail/) - [Collect logs with opentelemetry-collector](https://grafana.com/docs/grafana-cloud/send-data/logs/collect-logs-with-otel/) +- [Collect logs with Promtail](https://grafana.com/docs/enterprise-logs/latest/send-data/promtail/) - [Loki HTTP API][Push API] [Push API]: https://grafana.com/docs/loki/latest/reference/loki-http-api/ diff --git a/docs/explanation/telemetry-labels.md b/docs/explanation/telemetry-labels.md index 3456922c..7e852eab 100644 --- a/docs/explanation/telemetry-labels.md +++ b/docs/explanation/telemetry-labels.md @@ -113,7 +113,7 @@ all of the labels specified in the `stream` section above will be applied to all ## Scrape job labels for logs Log files can be scraped by Promtail or grafana agent, which then stream the log lines to Loki using Loki's `push-api` endpoint. -Promtail, similar to grafana agent, has a [`scarpe_configs` section in its config file](https://grafana.com/docs/loki/latest/send-data/promtail/configuration/#scrape_configs) for specifying targets (log filename) and associate labels to them. +Promtail, similar to grafana agent, has a [`scarpe_configs` section in its config file](https://grafana.com/docs/enterprise-logs/latest/send-data/promtail/) for specifying targets (log filename) and associate labels to them. See also grafana agent's [config file](https://grafana.com/docs/agent/latest/static/configuration/logs-config/) docs. From 50c5fa41cfe75c7600e777d740a8a209b124e9b9 Mon Sep 17 00:00:00 2001 From: Michael Thamm Date: Mon, 30 Mar 2026 14:07:07 -0400 Subject: [PATCH 2/2] docs: Update otelcol pin --- docs/reference/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/reference/release-notes.md b/docs/reference/release-notes.md index 862fd799..5b655b05 100644 --- a/docs/reference/release-notes.md +++ b/docs/reference/release-notes.md @@ -26,6 +26,8 @@ COS 2 is compatible with Juju v3.6+. When deployed using terraform, Juju v3.6.11 - `extra_alert_labels` config option. A new config option in grafana-agent and opentelemetry-collector enabled adding custom labels to alert rules. Custom labels are useful for differentiating alerts coming from sites with different SLAs. - **API links in catalogue-k8s**. The cards in catalogue-k8s now support extra links for documentation and APIs. COS charms now provide links to the workload API, making it easier to locate ingress URLs for workloads without a web UI. +- **Opentelemetry collector**. Charmed opentelemetry-collector's workload is pinned to version 0.130 because the upstream `opentelemetry-collector-contrib` [project](https://github.com/open-telemetry/opentelemetry-collector-contrib) dropped support for Loki exporter in [release v0.131.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.131.0), stating that users can migrate to the OTLP exporters instead. + - The logging integrations for the `opentelemetry-collector` charms rely on `lokiexporter` to send logs to Loki push API endpoints. Loki only recently received upstream support for an OTLP endpoint, and migrating to an OTLP-first ecosystem in COS began in 26.04. The objective is to have support for OTLP ecosystem-wide by the end of 26.10 and to deprecate the Loki Push API feature (`logging` endpoint). Support will then be fully dropped in 27.04, and the `opentelemetry-collector` charms will no longer be pinned to `v0.130`. ## Notable changes in peripheral charms - Multiple scripts in script-exporter. The script exporter VM charm can now take an archive of scripts. It can now be deployed on 20.04, 22.04 and 24.04.