From f3a218e6ca63fff8c2ad807b27bddab9bfcc19c0 Mon Sep 17 00:00:00 2001 From: Lorenzo Mangani Date: Tue, 17 Oct 2023 15:23:21 +0200 Subject: [PATCH 1/5] Adding qryn to the registry and vendor list (#3379) Co-authored-by: Severin Neumann --- data/ecosystem/vendors.yaml | 9 ++++++++- data/registry/collector-exporter-qryn.yml | 19 +++++++++++++++++++ static/refcache.json | 12 ++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 data/registry/collector-exporter-qryn.yml diff --git a/data/ecosystem/vendors.yaml b/data/ecosystem/vendors.yaml index 742e8c1069ac..f463930428d2 100644 --- a/data/ecosystem/vendors.yaml +++ b/data/ecosystem/vendors.yaml @@ -1,4 +1,4 @@ -# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate +# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate qryn - name: AppDynamics (Cisco) distribution: true nativeOTLP: true @@ -209,6 +209,13 @@ contact: '' oss: false commercial: true +- name: qryn + distribution: true + nativeOTLP: true + url: 'https://qryn.metrico.in/#/support?id=tempo-api' + contact: 'https://github.com/lmangani' + oss: true + commercial: true - name: Sentry distribution: true nativeOTLP: false diff --git a/data/registry/collector-exporter-qryn.yml b/data/registry/collector-exporter-qryn.yml new file mode 100644 index 000000000000..fbaede7e4bb9 --- /dev/null +++ b/data/registry/collector-exporter-qryn.yml @@ -0,0 +1,19 @@ +# cSpell:ignore qryn loki +title: qryn exporter +registryType: exporter +isThirdParty: true +language: collector +tags: + - go + - exporter + - qryn + - loki + - prometheus + - tempo +repo: https://github.com/metrico/otel-collector +license: Apache 2.0 +description: + This exporter supports sending OpenTelemetry logs, traces and metrics to + ClickHouse using the qryn polyglot format. +authors: akvlad@qxip.net, lorenzo@qxip.net +otVersion: latest diff --git a/static/refcache.json b/static/refcache.json index a74dad2acc38..b97629f58fc9 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -2219,6 +2219,14 @@ "StatusCode": 200, "LastSeen": "2023-07-06T11:55:26.882609-07:00" }, + "https://github.com/metrico/otel-collector": { + "StatusCode": 200, + "LastSeen": "2023-10-17T15:13:11.067528+02:00" + }, + "https://github.com/metrico/qryn-collector": { + "StatusCode": 404, + "LastSeen": "2023-10-17T15:10:07.758268+02:00" + }, "https://github.com/mhausenblas": { "StatusCode": 200, "LastSeen": "2023-06-30T09:39:03.127776-04:00" @@ -4779,6 +4787,10 @@ "StatusCode": 206, "LastSeen": "2023-06-30T11:43:42.332023-04:00" }, + "https://qryn.metrico.in/#/support": { + "StatusCode": 206, + "LastSeen": "2023-10-17T15:10:07.18892+02:00" + }, "https://quarkus.io": { "StatusCode": 206, "LastSeen": "2023-06-29T18:38:25.768525-04:00" From acd960eecb2f02ce7121a2ec7273bd762488ea86 Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Tue, 17 Oct 2023 15:28:14 +0200 Subject: [PATCH 2/5] Rename _index to index for resources and instrumentation scope pages (#3399) --- .../docs/concepts/instrumentation-scope/{_index.md => index.md} | 0 content/en/docs/concepts/resources/{_index.md => index.md} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename content/en/docs/concepts/instrumentation-scope/{_index.md => index.md} (100%) rename content/en/docs/concepts/resources/{_index.md => index.md} (100%) diff --git a/content/en/docs/concepts/instrumentation-scope/_index.md b/content/en/docs/concepts/instrumentation-scope/index.md similarity index 100% rename from content/en/docs/concepts/instrumentation-scope/_index.md rename to content/en/docs/concepts/instrumentation-scope/index.md diff --git a/content/en/docs/concepts/resources/_index.md b/content/en/docs/concepts/resources/index.md similarity index 100% rename from content/en/docs/concepts/resources/_index.md rename to content/en/docs/concepts/resources/index.md From 3114ddde2f2cc42aed921a5ec1087c99040a573c Mon Sep 17 00:00:00 2001 From: Tanya Bragin Date: Tue, 17 Oct 2023 06:38:56 -0700 Subject: [PATCH 3/5] Update vendors.yaml to add ClickHouse (#3378) Co-authored-by: Severin Neumann --- data/ecosystem/vendors.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/ecosystem/vendors.yaml b/data/ecosystem/vendors.yaml index f463930428d2..fb6489490626 100644 --- a/data/ecosystem/vendors.yaml +++ b/data/ecosystem/vendors.yaml @@ -1,4 +1,4 @@ -# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate qryn +# cSpell:ignore Coralogix Cribl ITRS Kloud Logz Crowdstrike Humio Lumigo observ Teletrace Uptrace Greptime KloudMate qryn ClickHouse - name: AppDynamics (Cisco) distribution: true nativeOTLP: true @@ -328,3 +328,10 @@ contact: 'info@greptime.com' oss: true commercial: true +- name: ClickHouse + distribution: false + nativeOTLP: false + url: 'https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/clickhouseexporter' + contact: 'https://github.com/tbragin' + oss: true + commercial: true From 5d822a76c3af5e5fef6def6ce8f81f9b22d15d82 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Tue, 17 Oct 2023 09:45:03 -0400 Subject: [PATCH 4/5] Drop Additional Terminology section from glossary (#3400) --- content/en/docs/concepts/glossary.md | 30 ---------------------------- 1 file changed, 30 deletions(-) diff --git a/content/en/docs/concepts/glossary.md b/content/en/docs/concepts/glossary.md index 2a95a96b80e3..8d00ac455cfe 100644 --- a/content/en/docs/concepts/glossary.md +++ b/content/en/docs/concepts/glossary.md @@ -332,36 +332,6 @@ An in-process alternative to external exporters. When included, they collect and aggregate tracing and metrics information in the background; this data is served on web pages when requested. See [more][zpages]. -## Additional Terminology - -### Traces - -#### **[Trace API Terminology](/docs/specs/otel/trace/api)** - -#### **[Trace SDK Terminology](/docs/specs/otel/trace/sdk)** - -### Metrics - -#### **[Metric API Terminology](/docs/specs/otel/metrics/api#overview)** - -#### **[Metric SDK Terminology](/docs/specs/otel/metrics#specifications)** - -### Logs - -#### **[Trace Context Fields](/docs/specs/otel/logs/data-model#trace-context-fields)** - -#### **[Severity Fields](/docs/specs/otel/logs/data-model#severity-fields)** - -#### **[Log Record Fields](/docs/specs/otel/logs/data-model#log-and-event-record-definition)** - -### Semantic Conventions - -#### **[Resource Conventions](/docs/specs/semconv/resource/)** - -#### **[Span Conventions](/docs/specs/semconv/general/trace/)** - -#### **[Metric Conventions](/docs/specs/semconv/general/metrics/)** - [baggage]: /docs/specs/otel/baggage/api/ [attribute]: /docs/specs/otel/common/#attributes [collector]: /docs/collector From 484c155f79b0becad5cd7812e6f4e526e8829785 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Tue, 17 Oct 2023 10:37:03 -0400 Subject: [PATCH 5/5] Ensure all links to semconv pages are localized (#3401) --- .warnings-skip-list.txt | 1 - scripts/content-modules/adjust-pages.pl | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.warnings-skip-list.txt b/.warnings-skip-list.txt index a1bf445bac4e..e69de29bb2d1 100644 --- a/.warnings-skip-list.txt +++ b/.warnings-skip-list.txt @@ -1 +0,0 @@ -docs/specs/otel/common/attribute-requirement-level.md diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index a56d4a32e09d..0268b9e76e56 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -128,8 +128,8 @@ () s|(\]:\s+\|\()?https://github.com/open-telemetry/opentelemetry-proto/(\w+/.*?/)?docs/specification.md(\)?)|$1$specBasePath/otlp/$3|g; s|github.com/open-telemetry/opentelemetry-proto/docs/specification.md|OTLP|g; - # Match links to semconv - s|(\]:\s+\|\()https://github.com/open-telemetry/semantic-conventions/\w+/(main\|v$semconvVers)/docs(.*?\)?)|$1$specBasePath/semconv$3|; + # Localize links to semconv + s|(\]:\s+\|\()https://github.com/open-telemetry/semantic-conventions/\w+/(main\|v$semconvVers)/docs(.*?\)?)|$1$specBasePath/semconv$3|g; # Images s|(\.\./)?internal(/img/[-\w]+\.png)|$2|g;