Skip to content

Commit

Permalink
Merge branch 'main' into chalin-im-refcache-refresh-2024-01-18
Browse files Browse the repository at this point in the history
  • Loading branch information
cartermp authored Jan 18, 2024
2 parents 12513ee + d4513e9 commit 2188c65
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .cspell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ words:
- currencyservice
- daemonset
- datadog
- dataprepper
- declarators
- discoverability
- dotnet
Expand Down Expand Up @@ -117,7 +116,7 @@ words:
- postgresql
- Pranay
- Prateek
- Prepper
- prepper
- Println
- productcatalogservice
- prometheus
Expand Down
7 changes: 3 additions & 4 deletions content/en/blog/2023/logs-collection/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,8 @@ extend Yoda's code to do the following:
[transform or attributes processors](/docs/collector/transforming-telemetry/).
1. Add [tracing](/docs/concepts/signals/traces/) support by emitting spans,
where it makes sense.
1. Add an Observability backend such as OpenSearch (along with [Data
Prepper][dataprepper]) to the setup, allowing to ingest spans and logs in
OTLP format.
1. Add an Observability backend such as OpenSearch (along with [Data Prepper])
to the setup, allowing to ingest spans and logs in OTLP format.
1. Once you have traces and logs ingested in a backend, try to correlate these
two telemetry signal types in the backend along with a frontend such as
Grafana.
Expand Down Expand Up @@ -466,7 +465,7 @@ check out the following resources:
[otlp]: /docs/specs/otlp/
[otelbin-yoda]:
https://www.otelbin.io/?#config=receivers%3A*N__otlp%3A*N____protocols%3A*N______grpc%3A*Nexporters%3A*N__logging%3A*N____verbosity%3A_detailed*Nservice%3A*N__pipelines%3A*N____logs%3A*N______receivers%3A_%5B_otlp_%5D*N______exporters%3A_%5B_logging_%5D%7E
[dataprepper]: https://opensearch.org/docs/latest/data-prepper/index/
[data prepper]: https://opensearch.org/docs/latest/data-prepper/index/
[svrnm]: https://github.com/svrnm
[hossko]: https://github.com/hossko
[otel-logs-spec]: /docs/specs/otel/logs/
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/demo/feature-flags.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Feature Flags
aliases: [feature_flags, ../feature_flags/]
aliases: [feature_flags]
cSpell:ignore: OLJCESPC7Z
---

Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/demo/telemetry-features/_index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Telemetry Features
linkTitle: Telemetry Features
aliases: [demo_features]
aliases: [demo_features, features]
---

## OpenTelemetry
Expand All @@ -25,8 +25,8 @@ aliases: [demo_features]
Grafana.
- **[Jaeger](https://www.jaegertracing.io/)**: all generated traces are being
sent to Jaeger.
- **[OpenSearch](https://opensearch.org/)**: all generated logs are sent to
DataPrepper. OpenSearch will be used to centralize logging data from services.
- **[OpenSearch](https://opensearch.org/)**: all generated logs are sent to Data
Prepper. OpenSearch will be used to centralize logging data from services.
- **[Prometheus](https://prometheus.io/)**: all generated metrics and exemplars
are scraped by Prometheus.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Log Coverage by Service
linkTitle: Log Coverage
aliases: [log_service_features, ../log_features]
aliases: [log_service_features, ../logging-features]
---

| Service | Language | OTLP Logs |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
title: Manual Span Attributes
aliases: [manual_span_attributes]
aliases: [manual_span_attributes, ../manual-span-attributes]
cSpell:ignore: featureflag
---

This document contains the list of manual Span Attributes used throughout the
demo:
This page lists the manual Span Attributes used throughout the demo:

## AdService

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/demo/telemetry-features/metric-features.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Metric Coverage by Service
linkTitle: Metric Coverage
aliases: [metric_service_features, ../metric_features]
aliases: [metric_service_features, ../metric-features]
---

| Service | Language | Auto-instrumentation | Manual Instrumentation | Multiple Instruments | Views | Custom Attributes | Resource Detection | Trace Exemplars |
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/demo/telemetry-features/trace-features.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Trace Coverage by Service
linkTitle: Trace Coverage
aliases: [trace_service_features, ../trace_features]
aliases: [trace_service_features, ../trace-features]
---

| Service | Language | Instrumentation Libraries | Manual Span Creation | Span Data Enrichment | RPC Context Propagation | Span Links | Baggage | Resource Detection |
Expand Down

0 comments on commit 2188c65

Please sign in to comment.