Skip to content

Commit 8db0ed9

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 68ba7e6 + 4821958 commit 8db0ed9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1090
-72
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,7 @@ workshop/ninja/advanced otel/gateway/otelcol_darwin_arm64_splunk
6363
workshop/ninja/advanced otel/gateway/otelcol-contrib
6464
workshop/tagging/creditcheckservice-java/target/*
6565
workshop/tagging/creditcheckservice-java-with-tags/target/*
66-
agent.out
66+
*.out
67+
checkpoint-folder
68+
checkpoint-folder/*
69+
workshop/ninja/advanced-otel/3-other-logs/important_logs.log

content/en/ninja-workshops/8-advanced-otel/_index.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,25 @@ The goal of this workshop is to introduce you to the concepts of ....
2525
* otel bin
2626
---
2727

28+
29+
Pre req done before the session:
30+
31+
download the splunk version of the collector for your platform version X -> urls for mac os arm macos intel windows 64 and linux 64 AMD
32+
33+
https://github.com/signalfx/splunk-otel-collector/releases/download/v0.115.0/otelcol_darwin_arm64
34+
https://github.com/signalfx/splunk-otel-collector/releases/download/v0.115.0/splunk-otel-collector-0.115.0-amd64.msi
35+
36+
https://github.com/signalfx/splunk-otel-collector/releases/download/v0.115.0/otelcol_darwin_amd64
37+
38+
39+
40+
install brew macos
41+
42+
chocolatey install windows:
43+
Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
44+
45+
install jq using either platform
46+
47+
install collect D vi brew on mac -> windows
48+
2849
<!-- {{% children containerstyle="ul" depth="1" description="true" %}} -->
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
receivers:
2+
3+
exporters:
4+
5+
processors:
6+
memory_limiter:
7+
check_interval: 2s
8+
limit_mib: 512
9+
10+
service:
11+
pipelines:
12+
traces:
13+
metrics:
14+
logs:
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
receivers:
2+
hostmetrics:
3+
collection_interval: 10s
4+
scrapers:
5+
cpu:
6+
otlp:
7+
protocols:
8+
http:
9+
endpoint: "0.0.0.0:4318"
10+
11+
exporters:
12+
debug:
13+
verbosity: detailed
14+
15+
processors:
16+
batch:
17+
metadata_keys:
18+
- X-SF-Token
19+
memory_limiter:
20+
check_interval: 2s
21+
limit_mib: 512
22+
23+
resourcedetection:
24+
detectors: [system]
25+
override: true
26+
27+
resource/add_mode:
28+
attributes:
29+
- action: insert
30+
value: "agent"
31+
key: otelcol.service.mode
32+
33+
service:
34+
pipelines:
35+
traces:
36+
receivers: [otlp]
37+
processors:
38+
- memory_limiter
39+
- batch
40+
- resource/add_mode
41+
- resourcedetection
42+
exporters: [debug]
43+
metrics:
44+
receivers: [hostmetrics, otlp]
45+
processors:
46+
- memory_limiter
47+
- batch
48+
- resource/add_mode
49+
- resourcedetection
50+
exporters: [debug]
51+
logs:
52+
receivers: [otlp]
53+
processors:
54+
- memory_limiter
55+
- batch
56+
- resource/add_mode
57+
- resourcedetection
58+
exporters: [debug]
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
receivers:
2+
hostmetrics:
3+
collection_interval: 10s
4+
scrapers:
5+
cpu:
6+
otlp:
7+
protocols:
8+
http:
9+
endpoint: "0.0.0.0:4318"
10+
11+
exporters:
12+
debug:
13+
verbosity: detailed
14+
file:
15+
path: ./agent.out
16+
rotation:
17+
max_megabytes: 2
18+
max_backups: 2
19+
20+
processors:
21+
batch:
22+
metadata_keys:
23+
- X-SF-Token
24+
memory_limiter:
25+
check_interval: 2s
26+
limit_mib: 512
27+
28+
resourcedetection:
29+
detectors: [system]
30+
override: true
31+
32+
resource/add_mode:
33+
attributes:
34+
- action: insert
35+
value: "agent"
36+
key: otelcol.service.mode
37+
38+
service:
39+
pipelines:
40+
traces:
41+
receivers: [otlp]
42+
processors:
43+
- memory_limiter
44+
- batch
45+
- resource/add_mode
46+
- resourcedetection
47+
exporters: [file, debug]
48+
metrics:
49+
receivers: [hostmetrics, otlp]
50+
processors:
51+
- memory_limiter
52+
- batch
53+
- resource/add_mode
54+
- resourcedetection
55+
exporters: [file, debug]
56+
logs:
57+
receivers: [otlp]
58+
processors:
59+
- memory_limiter
60+
- batch
61+
- resource/add_mode
62+
- resourcedetection
63+
exporters: [file, debug]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
#$HOME/collectors/otelcol_darwin_arm64 --config=agent-debug.yaml
3+
$HOME/collectors/otelcol_darwin_arm64 --config=agent-file.yaml

workshop/ninja/advanced-otel/1-gateway/start-agent.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

workshop/ninja/advanced-otel/1-gateway/start-gateway.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)