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

[WIP] Update observability OSS module #1056

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
65eb719
Add Terraform code to provision AMP, Loki, Tempo and Grafana.
aonz Aug 21, 2024
584d7c9
Add ADOT config.
aonz Aug 21, 2024
ea0d643
Migrate Kubecost module into OSS module and switch to AMP.
aonz Aug 22, 2024
61b7d17
Add the tests folder for OSS module.
aonz Aug 22, 2024
e375fa9
Inject OTel environment variables to the app deployments.
aonz Aug 23, 2024
28baec7
Add test cases.
aonz Aug 23, 2024
e7e9358
Add test cases.
aonz Aug 23, 2024
b26b0e4
Add website docs for OSS module.
aonz Aug 27, 2024
a185f45
Remove old OSS and Kubecost modules.
aonz Aug 27, 2024
06bdf09
Merge branch 'main' into observability/oss
aonz Aug 27, 2024
b1ade48
Fix spell checker errors.
aonz Aug 27, 2024
53c721d
Update website docs for OSS module.
aonz Aug 27, 2024
5a4cc57
Update website docs for OSS module.
aonz Aug 27, 2024
7293e91
Update website docs for OSS module.
aonz Aug 27, 2024
5609911
Update website docs for OSS module.
aonz Aug 28, 2024
0b61260
Update website docs for OSS module.
aonz Aug 28, 2024
237debb
Add automated tests for OSS module.
aonz Aug 28, 2024
c825946
Add automated tests for OSS module.
aonz Aug 28, 2024
4f9f08b
Add automated tests for OSS module.
aonz Aug 28, 2024
d17805f
Add automated tests for OSS module.
aonz Aug 28, 2024
5729313
Add automated tests for OSS module.
aonz Aug 28, 2024
f244127
Merge branch 'main' into observability/oss
aonz Sep 27, 2024
42f83ad
Fix typo.
aonz Sep 27, 2024
3814478
Merge branch 'main' into observability/oss
aonz Oct 2, 2024
36f2347
Remove old OSS metrics module.
aonz Oct 2, 2024
6ab7428
Remove old Kubecost module.
aonz Oct 2, 2024
c4a3665
Update the cleanup script for the OSS module.
aonz Oct 3, 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
3 changes: 3 additions & 0 deletions manifests/base-application/carts/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
prometheus.io/path: /actuator/prometheus
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
instrumentation.opentelemetry.io/inject-sdk: other/retail-store
labels:
app.kubernetes.io/name: carts
app.kubernetes.io/instance: carts
Expand All @@ -34,6 +35,8 @@ spec:
value: -XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
- name: SPRING_PROFILES_ACTIVE
value: dynamodb
- name: OTEL_SERVICE_NAME
value: carts-service
envFrom:
- configMapRef:
name: carts
Expand Down
3 changes: 3 additions & 0 deletions manifests/base-application/catalog/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
prometheus.io/path: /metrics
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
instrumentation.opentelemetry.io/inject-sdk: other/retail-store
labels:
app.kubernetes.io/name: catalog
app.kubernetes.io/instance: catalog
Expand All @@ -40,6 +41,8 @@ spec:
secretKeyRef:
name: catalog-db
key: password
- name: OTEL_SERVICE_NAME
value: catalog-service
envFrom:
- configMapRef:
name: catalog
Expand Down
4 changes: 4 additions & 0 deletions manifests/base-application/checkout/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
prometheus.io/path: /metrics
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
instrumentation.opentelemetry.io/inject-sdk: other/retail-store
labels:
app.kubernetes.io/name: checkout
app.kubernetes.io/instance: checkout
Expand All @@ -29,6 +30,9 @@ spec:
fsGroup: 1000
containers:
- name: checkout
env:
- name: OTEL_SERVICE_NAME
value: checkout-service
envFrom:
- configMapRef:
name: checkout
Expand Down
3 changes: 3 additions & 0 deletions manifests/base-application/orders/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
prometheus.io/path: /actuator/prometheus
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
instrumentation.opentelemetry.io/inject-sdk: other/retail-store
labels:
app.kubernetes.io/name: orders
app.kubernetes.io/instance: orders
Expand Down Expand Up @@ -62,6 +63,8 @@ spec:
secretKeyRef:
name: orders-db
key: password
- name: OTEL_SERVICE_NAME
value: orders-service
envFrom:
- configMapRef:
name: orders
Expand Down
3 changes: 3 additions & 0 deletions manifests/base-application/ui/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
prometheus.io/path: /actuator/prometheus
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
instrumentation.opentelemetry.io/inject-sdk: other/retail-store
labels:
app.kubernetes.io/name: ui
app.kubernetes.io/instance: ui
Expand All @@ -32,6 +33,8 @@ spec:
env:
- name: JAVA_OPTS
value: -XX:MaxRAMPercentage=75.0 -Djava.security.egd=file:/dev/urandom
- name: OTEL_SERVICE_NAME
value: ui-service
envFrom:
- configMapRef:
name: ui
Expand Down

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions manifests/modules/observability/kubecost/values.yaml

This file was deleted.

This file was deleted.

Loading
Loading