Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Dev To Prod #137

Merged
merged 5 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/regenerate-tutorials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ jobs:
"${GITHUB_WORKSPACE}/loki/docs/sources/send-data/alloy/examples/alloy-otel-logs.md"
"${GITHUB_WORKSPACE}/killercoda/loki/alloy-otel-logs"
working-directory: killercoda/tools/transformer
- run: >
./transformer
"${GITHUB_WORKSPACE}/loki/docs/sources/send-data/otel/otel-collector-getting-started.md"
"${GITHUB_WORKSPACE}/killercoda/loki/otel-collector-getting-started"
working-directory: killercoda/tools/transformer
- run: >
./transformer
"${GITHUB_WORKSPACE}/grafana/docs/sources/tutorials/alerting-get-started/index.md"
Expand Down
8 changes: 4 additions & 4 deletions loki/fluentbit-loki-tutorial/preprocessed.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Fluent Bit requires a configuration file to define the components and their rela

> Note: Killercoda has an inbuilt Code editor which can be accessed via the `Editor` tab.
1. Expand the `loki-fundamentals` directory in the file explorer of the `Editor` tab.
1. Locate the `fluent-bit.conf` file in the top level directory, `loki-fundamentals'.
1. Locate the `fluent-bit.conf` file in the top level directory, `loki-fundamentals`.
1. Click on the `fluent-bit.conf` file to open it in the code editor.

<!-- INTERACTIVE ignore START -->
Expand Down Expand Up @@ -222,9 +222,9 @@ This will start the following services:

Once started, you can access the Carnivorous Greenhouse application at [http://localhost:5005](http://localhost:5005). Generate some logs by interacting with the application in the following ways:

1. Create a user
1. Log in
1. Create a few plants to monitor
1. Create a user.
1. Log in.
1. Create a few plants to monitor.
1. Enable bug mode to activate the bug service. This will cause services to fail and generate additional logs.

Finally to view the logs in Loki, navigate to the Loki Logs Explore view in Grafana at [http://localhost:3000/a/grafana-lokiexplore-app/explore](http://localhost:3000/a/grafana-lokiexplore-app/explore).
Expand Down
2 changes: 1 addition & 1 deletion loki/fluentbit-loki-tutorial/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Fluent Bit requires a configuration file to define the components and their rela

1. Expand the `loki-fundamentals`{{copy}} directory in the file explorer of the `Editor`{{copy}} tab.

1. Locate the `fluent-bit.conf`{{copy}} file in the top level directory, `loki-fundamentals'.
1. Locate the `fluent-bit.conf`{{copy}} file in the top level directory, `loki-fundamentals`{{copy}}.

1. Click on the `fluent-bit.conf`{{copy}} file to open it in the code editor.

Expand Down
6 changes: 3 additions & 3 deletions loki/fluentbit-loki-tutorial/step3.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ This will start the following services:

Once started, you can access the Carnivorous Greenhouse application at [http://localhost:5005]({{TRAFFIC_HOST1_5005}}). Generate some logs by interacting with the application in the following ways:

1. Create a user
1. Create a user.

1. Log in
1. Log in.

1. Create a few plants to monitor
1. Create a few plants to monitor.

1. Enable bug mode to activate the bug service. This will cause services to fail and generate additional logs.

Expand Down
2 changes: 1 addition & 1 deletion loki/otel-collector-getting-started/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ In this scenario, we have a microservices application called the Carnivorous Gre

- **Database:** A database that stores user and plant data.

Each service generates logs using the OpenTelemetry SDK and exports to the OpenTelemetry Collector in the OpenTelemetry format (OTLP). The collector then ingests the logs and sends them to Loki.
Each service generates logs using the OpenTelemetry SDK and exports to the OpenTelemetry Collector in the OpenTelemetry format (OTLP). The Collector then ingests the logs and sends them to Loki.
14 changes: 7 additions & 7 deletions loki/otel-collector-getting-started/preprocessed.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Getting started with the OpenTelemetry Collector and Loki tutorial
menuTitle: OTel Collector tutorial
description: A Tutorial configuring the OpenTelemetry Collector to send OpenTelemetry logs to Loki
weight: 250
weight: 300
killercoda:
title: Getting started with the OpenTelemetry Collector and Loki tutorial
description: A Tutorial configuring the OpenTelemetry Collector to send OpenTelemetry logs to Loki
Expand Down Expand Up @@ -56,7 +56,7 @@ In this scenario, we have a microservices application called the Carnivorous Gre
- **Main App:** The main application that ties all the services together.
- **Database:** A database that stores user and plant data.

Each service generates logs using the OpenTelemetry SDK and exports to the OpenTelemetry Collector in the OpenTelemetry format (OTLP). The collector then ingests the logs and sends them to Loki.
Each service generates logs using the OpenTelemetry SDK and exports to the OpenTelemetry Collector in the OpenTelemetry format (OTLP). The Collector then ingests the logs and sends them to Loki.

<!-- INTERACTIVE page intro.md END -->

Expand Down Expand Up @@ -144,8 +144,8 @@ In this configuration:
- `receivers`: The list of receivers to receive telemetry data. In this case, we are using the `otlp` receiver.
- `otlp`: The OpenTelemetry receiver that accepts logs in the OpenTelemetry format.
- `protocols`: The list of protocols that the receiver supports. In this case, we are using `grpc` and `http`.
- `grpc`: The gRPC protocol configuration. The receiver will accept logs via gRPC on `4317`
- `http`: The HTTP protocol configuration. The receiver will accept logs via HTTP on `4318`
- `grpc`: The gRPC protocol configuration. The receiver will accept logs via gRPC on `4317`.
- `http`: The HTTP protocol configuration. The receiver will accept logs via HTTP on `4318`.
- `endpoint`: The IP address and port number to listen on. In this case, we are listening on all IP addresses on port `4317` for gRPC and port `4318` for HTTP.

For more information on the `otlp` receiver configuration, see the [OpenTelemetry Receiver OTLP documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md).
Expand Down Expand Up @@ -312,9 +312,9 @@ This will start the following services:

Once started, you can access the Carnivorous Greenhouse application at [http://localhost:5005](http://localhost:5005). Generate some logs by interacting with the application in the following ways:

1. Create a user
1. Log in
1. Create a few plants to monitor
1. Create a user.
1. Log in.
1. Create a few plants to monitor.
1. Enable bug mode to activate the bug service. This will cause services to fail and generate additional logs.

Finally to view the logs in Loki, navigate to the Loki Logs Explore view in Grafana at [http://localhost:3000/a/grafana-lokiexplore-app/explore](http://localhost:3000/a/grafana-lokiexplore-app/explore).
Expand Down
4 changes: 2 additions & 2 deletions loki/otel-collector-getting-started/step2.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ In this configuration:

- `protocols`{{copy}}: The list of protocols that the receiver supports. In this case, we are using `grpc`{{copy}} and `http`{{copy}}.

- `grpc`{{copy}}: The gRPC protocol configuration. The receiver will accept logs via gRPC on `4317`{{copy}}
- `grpc`{{copy}}: The gRPC protocol configuration. The receiver will accept logs via gRPC on `4317`{{copy}}.

- `http`{{copy}}: The HTTP protocol configuration. The receiver will accept logs via HTTP on `4318`{{copy}}
- `http`{{copy}}: The HTTP protocol configuration. The receiver will accept logs via HTTP on `4318`{{copy}}.

- `endpoint`{{copy}}: The IP address and port number to listen on. In this case, we are listening on all IP addresses on port `4317`{{copy}} for gRPC and port `4318`{{copy}} for HTTP.

Expand Down
6 changes: 3 additions & 3 deletions loki/otel-collector-getting-started/step3.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ This will start the following services:

Once started, you can access the Carnivorous Greenhouse application at [http://localhost:5005]({{TRAFFIC_HOST1_5005}}). Generate some logs by interacting with the application in the following ways:

1. Create a user
1. Create a user.

1. Log in
1. Log in.

1. Create a few plants to monitor
1. Create a few plants to monitor.

1. Enable bug mode to activate the bug service. This will cause services to fail and generate additional logs.

Expand Down
Loading