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: Staging to Prod #99

Merged
merged 42 commits into from
Aug 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4fb9cae
Added default status of bash statements to exec
Jayclifford345 Jul 18, 2024
02f7f41
added testing
Jayclifford345 Jul 18, 2024
d5b87be
Include more tests
jdbaldry Jul 30, 2024
86f40b5
Added new otel tutorial
Jayclifford345 Aug 2, 2024
f584f90
Merge pull request #89 from grafana/otel-collector-loki-docs
Jayclifford345 Aug 2, 2024
9f1cbf4
Fixed URL and includes
Jayclifford345 Aug 2, 2024
b10f01c
Merge pull request #90 from grafana/prod
Jayclifford345 Aug 2, 2024
3752def
Merge pull request #91 from grafana/otel-collector-loki-docs
Jayclifford345 Aug 2, 2024
fe484ba
Testing changes to QuickStart
Jayclifford345 Aug 2, 2024
85ba214
Merge branch 'staging' of https://github.com/grafana/killercoda into …
Jayclifford345 Aug 2, 2024
e9147c1
syntax
Jayclifford345 Aug 2, 2024
0881509
Merge https://github.com/grafana/killercoda into 71-feature-make-all-…
Jayclifford345 Aug 6, 2024
5be6bae
added documentation to higlight new default
Jayclifford345 Aug 6, 2024
80139a5
Merge branch '71-feature-make-all-bash-commands-default-to-exec' of h…
Jayclifford345 Aug 6, 2024
6cdf0e5
added default example
Jayclifford345 Aug 6, 2024
39b5660
Update docs/transformer.md
Jayclifford345 Aug 7, 2024
fac2eb8
Update docs/transformer.md
Jayclifford345 Aug 7, 2024
381c757
Update docs/transformer.md
Jayclifford345 Aug 7, 2024
cf9699a
Merge pull request #74 from grafana/71-feature-make-all-bash-commands…
Jayclifford345 Aug 7, 2024
17737f3
added alloy draft sandbox
Jayclifford345 Aug 7, 2024
7dd63e4
added tutorial
Jayclifford345 Aug 7, 2024
5812acc
updated url's
Jayclifford345 Aug 7, 2024
e7415a5
Fixed formatting
Jayclifford345 Aug 7, 2024
38121c3
fixed formatting of step 4
Jayclifford345 Aug 7, 2024
fccbc7a
added note for sandbox
Jayclifford345 Aug 7, 2024
714cb5b
fixed spacing
Jayclifford345 Aug 7, 2024
efea810
added note about editor
Jayclifford345 Aug 7, 2024
6b02c03
fixe formating
Jayclifford345 Aug 7, 2024
9076910
fixed formating
Jayclifford345 Aug 7, 2024
3cb8f0f
added sandbox workaround
Jayclifford345 Aug 7, 2024
f0edb0a
fixed spacing
Jayclifford345 Aug 7, 2024
4998809
added url
Jayclifford345 Aug 7, 2024
04dddfd
fixed links
Jayclifford345 Aug 7, 2024
b9c7bde
Added corrections to Alloy demo
Jayclifford345 Aug 12, 2024
95e662f
removed old course
Jayclifford345 Aug 12, 2024
d09e9d8
updated course
Jayclifford345 Aug 12, 2024
20ae487
fixed regex clash
Jayclifford345 Aug 12, 2024
59a07ac
fixed link url
Jayclifford345 Aug 12, 2024
1b18a20
updated quickstart for testing
Jayclifford345 Aug 13, 2024
0e584b3
added tip around editor
Jayclifford345 Aug 13, 2024
da5808c
Updated Alloy changes
Jayclifford345 Aug 13, 2024
7f3a703
added new tutorial
Jayclifford345 Aug 13, 2024
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
Prev Previous commit
Next Next commit
Fixed URL and includes
Jayclifford345 committed Aug 2, 2024
commit 9f1cbf4e309456f3e4aa72760dd7aa6abdd137d6
4 changes: 2 additions & 2 deletions loki/otel-collector-getting-started/finish.md
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@ Head back to where you started from to continue with the Loki documentation: [Lo

For more information on the OpenTelemetry Collector and the native OTLP endpoint of Loki, refer to the following resources:

- [Loki OTLP endpoint]({{< relref “./” >}})
- [Loki OTLP endpoint](https://grafana.com/docs/loki/latest/send-data/otel/)

- [How is native OTLP endpoint different from Loki Exporter]({{< relref “./native_otlp_vs_loki_exporter” >}})
- [How is native OTLP endpoint different from Loki Exporter](https://grafana.com/docs/loki/latest/send-data/otel/native_otlp_vs_loki_exporter)

- [OpenTelemetry Collector Configuration](https://opentelemetry.io/docs/collector/configuration/)

10 changes: 1 addition & 9 deletions loki/otel-collector-getting-started/step1.md
Original file line number Diff line number Diff line change
@@ -22,14 +22,6 @@ In this step, we will set up our environment by cloning the repository that cont
✔ Container loki-fundamentals_otel-collector_1 Started
```{{copy}}

<!-- raw HTML omitted -->

{{< admonition type=“note” >}}
The OpenTelemetry Collector container will show as `Stopped`{{copy}}. This is expected as we have provided an empty configuration file. We will update this file in the next step.
{{< /admonition >}}

<!-- raw HTML omitted -->

***Note:** The OpenTelemetry Collector container will show as `Stopped`. This is expected as we have provided an empty configuration file. We will update this file in the next step.*
**Note:** The OpenTelemetry Collector container will show as `Stopped`{{copy}}. This is expected as we have provided an empty configuration file. We will update this file in the next step.

Once we have finished configuring the OpenTelemetry Collector and sending logs to Loki, we will be able to view the logs in Grafana. To check if Grafana is up and running, navigate to the following URL: [http://localhost:3000]({{TRAFFIC_HOST1_3000}})
6 changes: 6 additions & 0 deletions loki/otel-collector-getting-started/step2.md
Original file line number Diff line number Diff line change
@@ -168,6 +168,12 @@ This will restart the OpenTelemetry Collector container with the new configurati
docker logs loki-fundamentals_otel-collector_1
```{{exec}}

Within the logs, you should see the following message:

```console
2024-08-02T13:10:25.136Z info service@v0.106.1/service.go:225 Everything is ready. Begin running and processing data.
```{{exec}}

# Stuck? Need help?

If you get stuck or need help creating the configuration, you can copy and replace the entire `otel-config.yaml`{{copy}} using the completed configuration file: