From d773cebf62a5f14e05f47863ba06ea2c9baf2723 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:36:52 -0400 Subject: [PATCH 01/10] Bump @opentelemetry/exporter-trace-otlp-http from 0.49.1 to 0.50.0 (#4268) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d7867a102140..695e488ee949 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "@opentelemetry/auto-instrumentations-web": "^0.38.0", "@opentelemetry/context-zone": "^1.8.0", "@opentelemetry/core": "^1.8.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.49.1", + "@opentelemetry/exporter-trace-otlp-http": "^0.50.0", "@opentelemetry/instrumentation": "^0.50.0", "@opentelemetry/resources": "^1.8.0", "@opentelemetry/sdk-trace-base": "^1.8.0", From de3ceb49fca6cfd97c1d281a5bd521da8e8a4279 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:57:11 +0200 Subject: [PATCH 02/10] Update opentelemetry-specification version to v1.32.0 (#4283) --- .gitmodules | 2 +- content-modules/opentelemetry-specification | 2 +- scripts/content-modules/adjust-pages.pl | 2 +- static/refcache.json | 24 +++++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 690e80fb5c0d..8a9df0e14cfd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,7 @@ [submodule "content-modules/opentelemetry-specification"] path = content-modules/opentelemetry-specification url = https://github.com/open-telemetry/opentelemetry-specification.git - spec-pin = v1.31.0 + spec-pin = v1.32.0 [submodule "content-modules/community"] path = content-modules/community url = https://github.com/open-telemetry/community diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification index 3985e212f0ef..93ddb3ac0e14 160000 --- a/content-modules/opentelemetry-specification +++ b/content-modules/opentelemetry-specification @@ -1 +1 @@ -Subproject commit 3985e212f0ef5439daf9b10f0ee490e349c69368 +Subproject commit 93ddb3ac0e144d0b90f04654a1759936663af008 diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index f493006d6b82..5dec4ff30f1d 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -18,7 +18,7 @@ my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md"; my $specBasePath = '/docs/specs'; my %versions = qw( - spec: 1.31.0 + spec: 1.32.0 otlp: 1.2.0 semconv: 1.25.0 ); diff --git a/static/refcache.json b/static/refcache.json index ca2eaf35b85a..ed48789170ad 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -3875,6 +3875,14 @@ "StatusCode": 200, "LastSeen": "2024-01-30T05:19:02.768932-05:00" }, + "https://github.com/open-telemetry/opentelemetry-specification/issues/3966": { + "StatusCode": 200, + "LastSeen": "2024-04-11T14:54:53.493845265Z" + }, + "https://github.com/open-telemetry/opentelemetry-specification/issues/3967": { + "StatusCode": 200, + "LastSeen": "2024-04-11T14:54:50.847233614Z" + }, "https://github.com/open-telemetry/opentelemetry-specification/issues/437": { "StatusCode": 200, "LastSeen": "2024-01-18T19:36:56.207791-05:00" @@ -6851,6 +6859,22 @@ "StatusCode": 206, "LastSeen": "2024-01-18T19:55:30.198683-05:00" }, + "https://prometheus.io/docs/instrumenting/clientlibs/": { + "StatusCode": 206, + "LastSeen": "2024-04-11T14:54:50.705990785Z" + }, + "https://prometheus.io/docs/instrumenting/exposition_formats/#basic-info": { + "StatusCode": 206, + "LastSeen": "2024-04-11T14:54:57.142101041Z" + }, + "https://prometheus.io/docs/instrumenting/exposition_formats/#comments-help-text-and-type-information": { + "StatusCode": 206, + "LastSeen": "2024-04-11T14:54:55.03691741Z" + }, + "https://prometheus.io/docs/instrumenting/writing_clientlibs/#overall-structure": { + "StatusCode": 206, + "LastSeen": "2024-04-11T14:54:52.880727432Z" + }, "https://prometheus.io/docs/practices/naming/#metric-names": { "StatusCode": 206, "LastSeen": "2024-01-18T19:06:10.627254-05:00" From 22e45beac289f124f535704a13b56a88eab6a4d9 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:01:10 +0200 Subject: [PATCH 03/10] Auto-update registry versions (fe114ac8dd015c4b44c2982aa5b6df4077bf6779) (#4289) --- data/registry/instrumentation-dotnet-aspnetcore.yml | 2 +- data/registry/instrumentation-dotnet-aws.yml | 2 +- data/registry/instrumentation-dotnet-http.yml | 2 +- data/registry/instrumentation-dotnet-instrumentation-aws.yml | 2 +- data/registry/instrumentation-dotnet-kafkaflow.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/registry/instrumentation-dotnet-aspnetcore.yml b/data/registry/instrumentation-dotnet-aspnetcore.yml index 265bd3793433..85d401f367bb 100644 --- a/data/registry/instrumentation-dotnet-aspnetcore.yml +++ b/data/registry/instrumentation-dotnet-aspnetcore.yml @@ -18,4 +18,4 @@ createdAt: 2022-11-07 package: registry: nuget name: OpenTelemetry.Instrumentation.AspNetCore - version: 1.8.0 + version: 1.8.1 diff --git a/data/registry/instrumentation-dotnet-aws.yml b/data/registry/instrumentation-dotnet-aws.yml index c2d954e6ed22..170f515e7f4a 100644 --- a/data/registry/instrumentation-dotnet-aws.yml +++ b/data/registry/instrumentation-dotnet-aws.yml @@ -19,4 +19,4 @@ createdAt: 2022-10-28 package: registry: nuget name: OpenTelemetry.Instrumentation.AWS - version: 1.1.0-beta.3 + version: 1.1.0-beta.4 diff --git a/data/registry/instrumentation-dotnet-http.yml b/data/registry/instrumentation-dotnet-http.yml index a15f6c7b05c4..80b1fcbf4cb3 100644 --- a/data/registry/instrumentation-dotnet-http.yml +++ b/data/registry/instrumentation-dotnet-http.yml @@ -18,4 +18,4 @@ createdAt: 2022-11-07 package: registry: nuget name: OpenTelemetry.Instrumentation.Http - version: 1.8.0 + version: 1.8.1 diff --git a/data/registry/instrumentation-dotnet-instrumentation-aws.yml b/data/registry/instrumentation-dotnet-instrumentation-aws.yml index 3b6a34d1b627..4bbe2df1847c 100644 --- a/data/registry/instrumentation-dotnet-instrumentation-aws.yml +++ b/data/registry/instrumentation-dotnet-instrumentation-aws.yml @@ -15,4 +15,4 @@ createdAt: 2022-10-28 package: registry: nuget name: OpenTelemetry.Instrumentation.AWS - version: 1.1.0-beta.3 + version: 1.1.0-beta.4 diff --git a/data/registry/instrumentation-dotnet-kafkaflow.yml b/data/registry/instrumentation-dotnet-kafkaflow.yml index f9be006be945..d8a0a0d12a00 100644 --- a/data/registry/instrumentation-dotnet-kafkaflow.yml +++ b/data/registry/instrumentation-dotnet-kafkaflow.yml @@ -20,4 +20,4 @@ isFirstParty: true package: name: KafkaFlow.OpenTelemetry registry: nuget - version: 3.0.6 + version: 3.0.7 From d7e40cfc6b1bc9537f7fcbbfc018cd776965cd0d Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Sun, 14 Apr 2024 03:08:57 +1000 Subject: [PATCH 04/10] document logs and metrics for quote service (#4279) Co-authored-by: Tiffany Hrabusa <30397949+tiffany76@users.noreply.github.com> Co-authored-by: Juliano Costa Co-authored-by: Fabrizio Ferri-Benedetti Co-authored-by: Phillip Carter --- content/en/docs/demo/services/quote.md | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/content/en/docs/demo/services/quote.md b/content/en/docs/demo/services/quote.md index ce3157297668..5d04345e8e41 100644 --- a/content/en/docs/demo/services/quote.md +++ b/content/en/docs/demo/services/quote.md @@ -92,8 +92,34 @@ $span->addEvent('Quote processed, response sent back', [ ## Metrics -TBD +In this demo, metrics are emitted by the batch trace and logs processors. The +metrics describe the internal state of the processor, such as number of exported +spans or logs, the queue limit, and queue usage. + +You can enable metrics by setting the environment variable +`OTEL_PHP_INTERNAL_METRICS_ENABLED` to `true`. + +A manual metric is also emitted, which counts the number of quotes generated, +including an attribute for the number of items. + +A counter is created from the globally configured Meter Provider, and is +incremented each time a quote is generated: + +```php +static $counter; +$counter ??= Globals::meterProvider() + ->getMeter('quotes') + ->createCounter('quotes', 'quotes', 'number of quotes calculated'); +$counter->add(1, ['number_of_items' => $numberOfItems]); +``` + +Metrics accumulate and are exported periodically based on the value configured +in `OTEL_METRIC_EXPORT_INTERVAL`. ## Logs -TBD +The quote service emits a log message after a quote is calculated. The Monolog +logging package is configured with a +[Logs Bridge](/docs/concepts/signals/logs/#log-appender--bridge) which converts +Monolog logs into the OpenTelemetry format. Logs sent to this logger will be +exported via the globally configured OpenTelemetry logger. From 11be596c82d61c906d3b58d85b51a4985fdeae31 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Sat, 13 Apr 2024 14:46:05 -0400 Subject: [PATCH 05/10] [demo] add trace links to fraud detection service (#4261) Co-authored-by: Phillip Carter --- content/en/docs/demo/telemetry-features/trace-coverage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/demo/telemetry-features/trace-coverage.md b/content/en/docs/demo/telemetry-features/trace-coverage.md index 4fcf56e1b1eb..e97581476de8 100644 --- a/content/en/docs/demo/telemetry-features/trace-coverage.md +++ b/content/en/docs/demo/telemetry-features/trace-coverage.md @@ -12,7 +12,7 @@ aliases: [trace_service_features, trace-features, ../trace-features] | Checkout | Go | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | ✅ | | Currency | C++ | 🔕 | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🚧 | | Email | Ruby | ✅ | ✅ | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | -| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | 🚧 | +| Fraud Detection | Kotlin | ✅ | 🚧 | 🚧 | 🚧 | ✅ | 🚧 | 🚧 | | Frontend | JavaScript | ✅ | ✅ | ✅ | 🔕 | ✅ | ✅ | ✅ | | Payment | JavaScript | ✅ | ✅ | ✅ | 🔕 | 🔕 | ✅ | ✅ | | Product Catalog | Go | ✅ | 🔕 | ✅ | 🔕 | 🔕 | 🔕 | 🚧 | From 2052cdeb2893f14a7d77e3db0bbdfd165cdbd8b9 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 15 Apr 2024 10:36:43 +0200 Subject: [PATCH 06/10] Update opentelemetry-collector-releases version to v0.98.0 (#4280) --- content/en/docs/collector/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/collector/_index.md b/content/en/docs/collector/_index.md index bdfe8da5024b..b14e306f34d2 100644 --- a/content/en/docs/collector/_index.md +++ b/content/en/docs/collector/_index.md @@ -3,7 +3,7 @@ title: Collector description: Vendor-agnostic way to receive, process and export telemetry data. aliases: [collector/about] cascade: - vers: 0.97.0 + vers: 0.98.0 weight: 10 --- From 3973ea5b0b9f60065d650fae59b25e4dce46f4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Let?= Date: Mon, 15 Apr 2024 10:46:27 +0200 Subject: [PATCH 07/10] Make feature-flags.md more obvious (#4291) --- content/en/docs/demo/feature-flags.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/demo/feature-flags.md b/content/en/docs/demo/feature-flags.md index f3c49f1dfa96..fe1dec81dfee 100644 --- a/content/en/docs/demo/feature-flags.md +++ b/content/en/docs/demo/feature-flags.md @@ -10,8 +10,8 @@ cSpell:ignore: flagd loadgenerator OLJCESPC7Z The demo provides several feature flags that you can use to simulate different scenarios. These flags are managed by [`flagd`](https://flagd.dev), a simple feature flag service that supports [OpenFeature](https://openfeature.dev). Flag -values are stored in the `demo.flagd.json` file. To enable a flag, change the -`defaultVariant` value in the config file for a given flag to "on". +values are stored in the `src/flagd/demo.flagd.json` file. To enable a flag, +change the `defaultVariant` value in the config file for a given flag to "on". | Feature Flag | Service(s) | Description | | ----------------------------------- | ---------------- | --------------------------------------------------------------------------------------------------------- | From 43284781e6b1f040f2aa42d9221b583159419905 Mon Sep 17 00:00:00 2001 From: Christopher Wildman Date: Mon, 15 Apr 2024 01:51:05 -0700 Subject: [PATCH 08/10] Fix default collector deployment receiver endpoint (#4285) --- content/en/docs/collector/deployment/agent.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/en/docs/collector/deployment/agent.md b/content/en/docs/collector/deployment/agent.md index 6db6d6b233ee..2a17343c3b7b 100644 --- a/content/en/docs/collector/deployment/agent.md +++ b/content/en/docs/collector/deployment/agent.md @@ -42,8 +42,8 @@ like so: receivers: otlp: # the OTLP receiver the app is sending traces to protocols: - grpc: - endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 processors: batch: @@ -66,8 +66,8 @@ service: receivers: otlp: # the OTLP receiver the app is sending metrics to protocols: - grpc: - endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 processors: batch: @@ -90,8 +90,8 @@ service: receivers: otlp: # the OTLP receiver the app is sending logs to protocols: - grpc: - endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 processors: batch: From 97f51f48f7f3d647b8d5ac1aa4d3790c60b52c28 Mon Sep 17 00:00:00 2001 From: Ishan Jain <51803183+ishanjainn@users.noreply.github.com> Date: Mon, 15 Apr 2024 14:31:01 +0530 Subject: [PATCH 09/10] Blog: Scaling OpenTelemetry Collectors using Ansible (#4182) --- content/en/blog/2024/scaling-collectors.md | 222 +++++++++++++++++++++ static/refcache.json | 22 +- 2 files changed, 241 insertions(+), 3 deletions(-) create mode 100644 content/en/blog/2024/scaling-collectors.md diff --git a/content/en/blog/2024/scaling-collectors.md b/content/en/blog/2024/scaling-collectors.md new file mode 100644 index 000000000000..e1ba3028967c --- /dev/null +++ b/content/en/blog/2024/scaling-collectors.md @@ -0,0 +1,222 @@ +--- +title: Manage OpenTelemetry Collectors at scale with Ansible +linkTitle: Collectors at scale with Ansible +date: 2024-04-15 +author: '[Ishan Jain](https://github.com/ishanjainn) (Grafana)' +cSpell:ignore: ansible associated Ishan ishanjainn Jain +--- + +You can scale the deployment of +[OpenTelemetry Collector](/docs/collector/deployment/) across multiple Linux +hosts through [Ansible](https://www.ansible.com/), to function both as +[gateways](/docs/collector/deployment/gateway/) and +[agents](/docs/collector/deployment/agent/) within your observability +architecture. Using the OpenTelemetry Collector in this dual capacity enables a +robust collection and forwarding of metrics, traces, and logs to analysis and +visualization platforms. + +We outline a strategy for deploying and managing the OpenTelemetry Collector's +scalable instances throughout your infrastructure using Ansible. In the +following example, we'll use [Grafana](https://grafana.com/) as the target +backend for metrics. + +## Prerequisites + +Before we begin, make sure you meet the following requirements: + +- Ansible installed on your base system +- SSH access to two or more Linux hosts +- Prometheus configured to gather your metrics + +## Install the Grafana Ansible collection + +The +[OpenTelemetry Collector role](https://github.com/grafana/grafana-ansible-collection/tree/main/roles/opentelemetry_collector) +is provided through the +[Grafana Ansible collection](https://docs.ansible.com/ansible/latest/collections/grafana/grafana/) +as of release 4.0. + +To install the Grafana Ansible collection, run this command: + +```sh +ansible-galaxy collection install grafana.grafana +``` + +## Create an Ansible inventory file + +Next, gather the IP addresses and URLs associated with your Linux hosts and +create an inventory file. + +1. Create an Ansible inventory file. + + An Ansible inventory, which resides in a file named `inventory`, lists each + host IP on a separate line, like this (8 hosts shown): + + ```properties + 10.0.0.1 # hostname = ubuntu-01 + 10.0.0.2 # hostname = ubuntu-02 + 10.0.0.3 # hostname = centos-01 + 10.0.0.4 # hostname = centos-02 + 10.0.0.5 # hostname = debian-01 + 10.0.0.6 # hostname = debian-02 + 10.0.0.7 # hostname = fedora-01 + 10.0.0.8 # hostname = fedora-02 + ``` + +2. Create an `ansible.cfg` file within the same directory as `inventory`, with + the following values: + + ```toml + [defaults] + inventory = inventory # Path to the inventory file + private_key_file = ~/.ssh/id_rsa # Path to private SSH Key + remote_user=root + ``` + +## Use the OpenTelemetry Collector Ansible role + +Next, define an Ansible playbook to apply your chosen or created OpenTelemetry +Collector role across your hosts. + +Create a file named `deploy-opentelemetry.yml` in the same directory as your +`ansible.cfg` and `inventory` files: + +```yaml +- name: Install OpenTelemetry Collector + hosts: all + become: true + + tasks: + - name: Install OpenTelemetry Collector + ansible.builtin.include_role: + name: opentelemetry_collectorr + vars: + otel_collector_receivers: + hostmetrics: + collection_interval: 60s + scrapers: + cpu: {} + disk: {} + load: {} + filesystem: {} + memory: {} + network: {} + paging: {} + process: + mute_process_name_error: true + mute_process_exe_error: true + mute_process_io_error: true + processes: {} + + otel_collector_processors: + batch: + resourcedetection: + detectors: [env, system] + timeout: 2s + system: + hostname_sources: [os] + transform/add_resource_attributes_as_metric_attributes: + error_mode: ignore + metric_statements: + - context: datapoint + statements: + - set(attributes["deployment.environment"], + resource.attributes["deployment.environment"]) + - set(attributes["service.version"], + resource.attributes["service.version"]) + + otel_collector_exporters: + prometheusremotewrite: + endpoint: https:///api/prom/push + headers: + Authorization: 'Basic ' + + otel_collector_service: + pipelines: + metrics: + receivers: [hostmetrics] + processors: + [ + resourcedetection, + transform/add_resource_attributes_as_metric_attributes, + batch, + ] + exporters: [prometheusremotewrite] +``` + +{{% alert title="Note" %}} + +Adjust the configuration to match the specific telemetry you intend to collect +as well as where you plan to forward it to. This configuration snippet is a +basic example designed for collecting host metrics that get forwarded to +Prometheus. + +{{% /alert %}} + +The previous configuration would provision the OpenTelemetry Collector to +collect metrics from the Linux host. + +## Running the Ansible playbook + +Deploy the OpenTelemetry Collector across your hosts by running the following +command: + +```sh +ansible-playbook deploy-opentelemetry.yml +``` + +## Check your metrics in the backend + +After your OpenTelemetry Collectors start sending metrics to Prometheus, follow +these steps to visualize them in Grafana: + +### Set up Grafana + +1. **Install Docker**: Make sure Docker is installed on your system. + +2. **Run Grafana Docker Container**: Start a Grafana server with the following + command, which fetches the latest Grafana image: + + ```sh + docker run -d -p 3000:3000 --name=grafana grafana/grafana + ``` + +3. **Access Grafana**: Open in your web browser. The + default login username and password are both `admin`. + +4. **Change passwords** when prompted on first login -- pick a secure one! + +For other installation methods and more detailed instructions, refer to the +[official Grafana documentation](https://grafana.com/docs/grafana/latest/#installing-grafana). + +### Add Prometheus as a data source + +1. In Grafana, navigate to **Connections** > **Data Sources**. +2. Click **Add data source** and select **Prometheus**. +3. In the settings, enter your Prometheus URL, for example, + `http://`, along with any other necessary details. +4. Select **Save & Test**. + +### Explore your metrics + +1. Go to the **Explore** page +2. In the Query editor, select your data source and enter the following query + + ```PromQL + 100 - (avg by (cpu) (irate(system_cpu_time{state="idle"}[5m])) * 100) + ``` + + This query calculates the average percentage of CPU time not spent in the + "idle" state, across each CPU core, over the last 5 minutes. + +3. Explore other metrics and create dashboards to gain insights into your + system's performance. + +This blog post illustrated how you can configure and deploy multiple +OpenTelemetry Collectors across various Linux hosts with the help of Ansible, as +well as visualize collected telemetry in Grafana. Incase you find this useful, +GitHub repository for +[OpenTelemetry Collector role](https://github.com/grafana/grafana-ansible-collection/tree/main/roles/opentelemetry_collector) +for detailed configuration options. If you have questions, You can connect with +me using my contact details at my GitHub profile +[@ishanjainn](https://github.com/ishanjainn). diff --git a/static/refcache.json b/static/refcache.json index ed48789170ad..4c60e47840b9 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -811,6 +811,10 @@ "StatusCode": 206, "LastSeen": "2024-01-30T16:07:39.690877-05:00" }, + "https://docs.ansible.com/ansible/latest/collections/grafana/grafana/": { + "StatusCode": 206, + "LastSeen": "2024-03-19T11:21:52.991213698Z" + }, "https://docs.appdynamics.com/latest/en/application-monitoring/appdynamics-for-opentelemetry": { "StatusCode": 200, "LastSeen": "2024-01-18T08:51:22.195056-05:00" @@ -2595,6 +2599,10 @@ "StatusCode": 200, "LastSeen": "2024-01-30T16:14:36.112572-05:00" }, + "https://github.com/ishanjainn": { + "StatusCode": 200, + "LastSeen": "2024-03-19T11:21:47.871135724Z" + }, "https://github.com/jack-berg": { "StatusCode": 200, "LastSeen": "2024-01-18T20:04:54.949867-05:00" @@ -4489,15 +4497,19 @@ }, "https://grafana.com/docs/alloy/latest/": { "StatusCode": 200, - "LastSeen": "2024-04-10T00:09:47.949842+02:00" + "LastSeen": "2024-04-12T20:40:28.798266582Z" }, "https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/instrument/dotnet/": { "StatusCode": 200, - "LastSeen": "2024-04-10T00:09:50.125651+02:00" + "LastSeen": "2024-04-12T20:40:30.368448693Z" }, "https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/instrument/java/": { "StatusCode": 200, - "LastSeen": "2024-04-10T00:09:55.400731+02:00" + "LastSeen": "2024-04-12T20:40:34.652514906Z" + }, + "https://grafana.com/docs/grafana/latest/#installing-grafana": { + "StatusCode": 200, + "LastSeen": "2024-04-12T20:40:33.435682362Z" }, "https://grafana.com/oss/opentelemetry/": { "StatusCode": 200, @@ -7811,6 +7823,10 @@ "StatusCode": 200, "LastSeen": "2024-01-19T09:04:05.862693+01:00" }, + "https://www.ansible.com/": { + "StatusCode": 200, + "LastSeen": "2024-03-19T11:21:48.883430689Z" + }, "https://www.apollographql.com/docs/federation/": { "StatusCode": 206, "LastSeen": "2024-01-18T19:55:56.349642-05:00" From c83c48330022839de92f0b2a580379a50c0f43e6 Mon Sep 17 00:00:00 2001 From: "Pal K. Klucsik" Date: Mon, 15 Apr 2024 11:21:17 +0200 Subject: [PATCH 10/10] Demo imageprovider docs (#4273) --- content/en/docs/demo/_index.md | 1 + content/en/docs/demo/architecture.md | 2 ++ content/en/docs/demo/services/imageprovider.md | 10 ++++++++++ 3 files changed, 13 insertions(+) create mode 100644 content/en/docs/demo/services/imageprovider.md diff --git a/content/en/docs/demo/_index.md b/content/en/docs/demo/_index.md index cb35886fbb6d..b09e5ec46468 100644 --- a/content/en/docs/demo/_index.md +++ b/content/en/docs/demo/_index.md @@ -52,6 +52,7 @@ found here: - [Quote Service](services/quote/) - [Recommendation Service](services/recommendation/) - [Shipping Service](services/shipping/) +- [Image Provider Service](services/imageprovider/) ## Scenarios diff --git a/content/en/docs/demo/architecture.md b/content/en/docs/demo/architecture.md index 26c706ff4a37..1b22adcacced 100644 --- a/content/en/docs/demo/architecture.md +++ b/content/en/docs/demo/architecture.md @@ -22,6 +22,7 @@ emailservice(Email Service):::ruby frauddetectionservice(Fraud Detection Service):::kotlin frontend(Frontend):::typescript frontendproxy(Frontend Proxy
(Envoy)):::cpp +imageprovider(Image Provider
(nginx)):::cpp loadgenerator([Load Generator]):::python paymentservice(Payment Service):::javascript productcatalogservice(Product Catalog Service):::golang @@ -33,6 +34,7 @@ queue[(queue
(Kafka))] Internet -->|HTTP| frontendproxy frontendproxy -->|HTTP| frontend loadgenerator -->|HTTP| frontendproxy +frontendproxy -->|HTTP| imageprovider queue -->|TCP| accountingservice queue -->|TCP| frauddetectionservice diff --git a/content/en/docs/demo/services/imageprovider.md b/content/en/docs/demo/services/imageprovider.md new file mode 100644 index 000000000000..0c597a14f866 --- /dev/null +++ b/content/en/docs/demo/services/imageprovider.md @@ -0,0 +1,10 @@ +--- +title: Image Provider Service +linkTitle: Image Provider +--- + +This service provides the images which are used in the frontend. The images are +statically hosted on a NGINX instance. The NGINX server is instrumented with the +[nginx-otel module](https://github.com/nginxinc/nginx-otel/tree/main). + +[Image Provider service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/imageprovider/)