Skip to content

Commit

Permalink
chore: first step to add tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
ctron committed Dec 17, 2024
1 parent 7ede2af commit d0018d9
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 5 deletions.
7 changes: 5 additions & 2 deletions charts/trustify-infrastructure/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ dependencies:
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 16.0.0
digest: sha256:a7acfa38d69773eacf25daa86787f3c2e608a4c7a9f960104be64ef6de9b1d22
generated: "2024-12-16T11:25:29.123055362+01:00"
- name: jaeger
repository: https://jaegertracing.github.io/helm-charts
version: 3.3.3
digest: sha256:1af1b7a450ff013caa7b815c14fe1a34040770a01aa765ff8b15cd41e840ad27
generated: "2024-12-17T10:22:56.132130532+01:00"
4 changes: 4 additions & 0 deletions charts/trustify-infrastructure/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ dependencies:
repository: oci://registry-1.docker.io/bitnamicharts
version: 16.0.0
condition: postgresql.enabled
- name: jaeger
repository: https://jaegertracing.github.io/helm-charts
version: 3.3.3
condition: jaeger.enabled
3 changes: 3 additions & 0 deletions charts/trustify-infrastructure/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ postgresql:
keycloak:
enabled: false

jaeger:
enabled: false

keycloakPostInstall:
disabled: false
# NOTE: this must be an image which contain things like bash, kcadm, grep, awk
Expand Down
2 changes: 1 addition & 1 deletion charts/trustify/templates/helpers/_infrastructure.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Arguments (dict):

{{- if eq ( include "trustification.application.tracing.enabled" . ) "true" }}
- name: TRACING
value: "true"
value: "enabled"
- name: OTEL_BSP_MAX_EXPORT_BATCH_SIZE
value: "32"
- name: OTEL_TRACES_SAMPLER
Expand Down
5 changes: 4 additions & 1 deletion charts/trustify/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@
},
"postgresql": {
"$ref": "#/definitions/Feature"
},
"jaeger": {
"$ref": "#/definitions/Feature"
}
},
"definitions": {
Expand Down Expand Up @@ -389,7 +392,7 @@
"Metrics": {
"type": "object",
"properties": {
"tracing": {
"metrics": {
"$ref": "#/definitions/MetricsConfig"
}
}
Expand Down
5 changes: 4 additions & 1 deletion charts/trustify/values.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,9 @@ properties:
postgresql:
$ref: "#/definitions/Feature"

jaeger:
$ref: "#/definitions/Feature"

# all the definitions

definitions:
Expand Down Expand Up @@ -299,7 +302,7 @@ definitions:
Metrics:
type: object
properties:
tracing:
metrics:
$ref: "#/definitions/MetricsConfig"

MetricsConfig:
Expand Down
18 changes: 18 additions & 0 deletions values-minikube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,24 @@ keycloak:
postgresql:
enabled: false # see remark in Chart.yaml

jaeger:
enabled: false # can be enabled with `--set jaeger.enabled=true`
# default to all-in-one
provisionDataStore:
cassandra: false
allInOne:
enabled: true
ingress:
enabled: true
storage:
type: memory
agent:
enabled: false
collector:
enabled: false
query:
enabled: false

oidc:
clients:
frontend: {}
Expand Down

0 comments on commit d0018d9

Please sign in to comment.