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.

Sign up for GitHub

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

MG-154 - Jaeger Cassandra pods are not stable #155

Merged
merged 8 commits into from
Oct 1, 2024
Merged

MG-154 - Jaeger Cassandra pods are not stable #155

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03e4dc8
Enable persistnce in cassandra; add more resources
JeffMboya Sep 26, 2024
55c6c97
remove resources sections
JeffMboya Sep 26, 2024
2a70782
add config
JeffMboya Sep 27, 2024
5ef2d1f
Update README
JeffMboya Sep 28, 2024
de5bba6
Update chart version
JeffMboya Sep 29, 2024
6bc9222
Update bootstrap values
JeffMboya Sep 29, 2024
adde8ae
Update app version
JeffMboya Sep 29, 2024
5f942d5
Remove unnecessary config
JeffMboya Sep 30, 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
2 changes: 1 addition & 1 deletion charts/magistrala/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: magistrala
description: Magistrala IoT Platform
icon: https://avatars1.githubusercontent.com/u/13207490
type: application
version: 0.14.0 # Incremented chart version if the chart is updated
version: 0.14.1 # Incremented chart version if the chart is updated
appVersion: "0.14.0" # Update application version if the app is updated
home: https://abstractmachines.fr/magistrala.html
sources:
Expand Down
35 changes: 21 additions & 14 deletions charts/magistrala/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Magistrala IoT Platform

![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)
![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square)

**Homepage:** <https://abstractmachines.fr/magistrala.html>

Expand Down Expand Up @@ -60,14 +60,8 @@ Magistrala IoT Platform
| bootstrap.encKey | string | `"randomstring"` | |
| bootstrap.eventConsumerName | string | `"EventConsumerByBootstrap"` | |
| bootstrap.httpPort | int | `9013` | |
| bootstrap.image.pullPolicy | string | `"IfNotPresent"` | |
| bootstrap.image.pullSecrets | object | `{}` | |
| bootstrap.image.repository | string | `"magistrala/bootstrap"` | |
| bootstrap.image.tag | string | `"latest"` | |
| bootstrap.jaegerTraceRatio | float | `1` | |
| bootstrap.logLevel | string | `"info"` | |
| bootstrap.image | object | `{}` | |
| bootstrap.redisESPort | int | `6379` | |
| bootstrap.sendTelemetry | bool | `true` | |
| certs.enabled | bool | `true` | |
| certs.httpPort | int | `9019` | |
| certs.image | object | `{}` | |
Expand Down Expand Up @@ -101,13 +95,26 @@ Magistrala IoT Platform
| invitations.image | object | `{}` | |
| jaeger.agent.enabled | bool | `false` | |
| jaeger.allInOne.enabled | bool | `false` | |
| jaeger.collector.service.otlp.grpc.name | string | `"otlp-grpc"` | |
| jaeger.collector.service.otlp.grpc.port | int | `4317` | |
| jaeger.collector.service.otlp.http.name | string | `"otlp-http"` | |
| jaeger.collector.service.otlp.http.port | int | `4318` | |
| jaeger.cassandra.config.cluster_name | string | `"jaeger"` | |
| jaeger.cassandra.config.dc_name | string | `"dc1"` | |
| jaeger.cassandra.config.endpoint_snitch | string | `"GossipingPropertyFileSnitch"` | |
| jaeger.cassandra.config.rack_name | string | `"rack1"` | |
| jaeger.cassandra.config.seed_size | int | `1` | |
| jaeger.cassandra.persistence.accessModes[0] | string | `"ReadWriteOnce"` | |
| jaeger.cassandra.persistence.enabled | bool | `true` | |
| jaeger.cassandra.persistence.size | string | `"10Gi"` | |
| jaeger.cassandra.persistence.storageClass | string | `"do-block-storage"` | |
| jaeger.fullnameOverride | string | `"magistrala-jaeger"` | |
| jaeger.provisionDataStore.cassandra | bool | `true` | |
| jaeger.storage.type | string | `"memory"` | |
| jaeger.storage.cassandra.host | string | `"magistrala-cassandra.mg.svc.cluster.local"` | |
| jaeger.storage.cassandra.keyspace | string | `"jaeger_v1"` | |
| jaeger.storage.cassandra.password | string | `"cassandra_password"` | |
| jaeger.storage.cassandra.port | int | `9042` | |
| jaeger.storage.cassandra.schemaJobEnabled | bool | `true` | |
| jaeger.storage.cassandra.tls.enabled | bool | `false` | |
| jaeger.storage.cassandra.usePassword | bool | `true` | |
| jaeger.storage.cassandra.user | string | `"cassandra_user"` | |
| jaeger.storage.type | string | `"cassandra"` | |
| journal.enabled | bool | `true` | |
| journal.httpPort | int | `9021` | |
| journal.image | object | `{}` | |
Expand Down Expand Up @@ -314,4 +321,4 @@ Magistrala IoT Platform
| users.passwordRegex | string | `"^.{8,}$"` | |
| users.secretKey | string | `"secretKey"` | |
| users.tokenResetEndpoint | string | `"/reset-request"` | |
| vault.enabled | bool | `true` | |
| vault.enabled | bool | `false` | |
95 changes: 60 additions & 35 deletions charts/magistrala/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,30 @@ jaeger:
allInOne:
enabled: false
storage:
type: memory
collector:
arvindh123 marked this conversation as resolved.
Show resolved Hide resolved
service:
otlp:
grpc:
name: otlp-grpc
port: 4317
http:
name: otlp-http
port: 4318
type: cassandra
cassandra:
host: magistrala-cassandra.mg.svc.cluster.local
port: 9042
schemaJobEnabled: true
tls:
enabled: false
user: cassandra_user
usePassword: true
password: cassandra_password
keyspace: jaeger_v1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this ?
I think this for externally provisioned cassandra

cassandra:
persistence:
enabled: true
storageClass: "do-block-storage"
accessModes:
- ReadWriteOnce
size: 10Gi
config:
cluster_name: jaeger
seed_size: 1
dc_name: dc1
rack_name: rack1
endpoint_snitch: GossipingPropertyFileSnitch
arvindh123 marked this conversation as resolved.
Show resolved Hide resolved
nats:
config:
cluster:
Expand All @@ -84,7 +98,8 @@ nats:
maxSize: 2Gi

adapter_coap:
image: {}
image:
{}
# pullSecrets: {}
# If your image repository requires authentication, you can specify image pull secrets here.
# Example:
Expand Down Expand Up @@ -138,7 +153,8 @@ adapter_coap:
# effect: "NoSchedule"

adapter_http:
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/adapter-http"
# tag: "latest"
Expand Down Expand Up @@ -228,7 +244,8 @@ postgresqlspicedb:

auth:
# logLevel: error
image: {}
image:
{}
# pullSecrets: {}
# rootRepository: "magistrala/auth"
# tag: "latest"
Expand Down Expand Up @@ -269,11 +286,12 @@ postgresqlauth:
postgresql: *postgresqlAuthPort

users:
image: {}
# pullSecrets: {}
# repository: "magistrala/users"
# tag: "latest"
# pullPolicy: "IfNotPresent"
image:
{}
# pullSecrets: {}
# repository: "magistrala/users"
# tag: "latest"
# pullPolicy: "IfNotPresent"
# jaegerTraceRatio: 1.0
# sendTelemetry: true
# logLevel: "info"
Expand Down Expand Up @@ -312,7 +330,8 @@ postgresqlusers:
postgresql: *postgresqlUsersPort

things:
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/things"
# tag: "latest"
Expand Down Expand Up @@ -356,14 +375,14 @@ redis-things:

bootstrap:
enabled: true
image:
pullSecrets: {}
repository: "magistrala/bootstrap"
tag: "latest"
pullPolicy: "IfNotPresent"
jaegerTraceRatio: 1.0
sendTelemetry: true
logLevel: "info"
image: {}
# pullSecrets: {}
# repository: "magistrala/bootstrap"
# tag: "latest"
# pullPolicy: "IfNotPresent"
# jaegerTraceRatio: 1.0
# sendTelemetry: true
# logLevel: "info"
httpPort: 9013
redisESPort: 6379
encKey: "randomstring"
Expand Down Expand Up @@ -394,7 +413,8 @@ postgresqlbootstrap:

certs:
enabled: true
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/certs"
# tag: "latest"
Expand Down Expand Up @@ -438,7 +458,8 @@ postgresqlcerts:

invitations:
enabled: true
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/invitations"
# tag: "latest"
Expand Down Expand Up @@ -473,7 +494,8 @@ postgresqlinvitations:

journal:
enabled: true
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/journal"
# tag: "latest"
Expand Down Expand Up @@ -516,7 +538,8 @@ timescaledb:
username: &messagesRwTimescaleUsername magistrala
password: &messagesRwTimescalePassword magistrala
reader:
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/timescale-reader"
# tag: "latest"
Expand All @@ -525,12 +548,13 @@ timescaledb:
# sendTelemetry: true
# logLevel: "info"
enabled: true
http: {port: 9011}
http: { port: 9011 }
# nodeSelector: {}
# affinity: {}
# tolerations: {}
writer:
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/timescale-writer"
# tag: "latest"
Expand All @@ -542,7 +566,7 @@ timescaledb:
# affinity: {}
# tolerations: {}
enabled: true
http: {port: 9012}
http: { port: 9012 }
## Configurations of Bitnami postgres
global:
postgresql:
Expand All @@ -561,7 +585,8 @@ timescaledb:

ui:
enabled: true
image: {}
image:
{}
# pullSecrets: {}
# repository: "magistrala/ui"
# tag: "latest"
Expand Down