Skip to content
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
c9c70d6
Arch Linux Certificates Customization
mrnicegyu11 Dec 3, 2024
7b8be53
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 5, 2024
bcd61cd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 12, 2024
58e1030
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 13, 2024
ed8d479
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jan 10, 2025
dda6e01
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 4, 2025
f6f4f36
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 25, 2025
5dca5c3
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 13, 2025
4a653ef
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 20, 2025
3a21f0f
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 28, 2025
48fbbca
Fix pgsql exporter failure
mrnicegyu11 Apr 24, 2025
08c57db
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 May 6, 2025
5ecbfec
[Kubernetes] Introduce on-prem persistent Storage (Longhorn) :tada: …
YuryHrytsuk May 6, 2025
3ea41b5
Experimental: Try to add tracing to simcore-traefik on master
mrnicegyu11 May 9, 2025
29f2f2e
Fixes https://github.com/ITISFoundation/osparc-simcore/issues/7363
mrnicegyu11 May 14, 2025
cdef57f
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 May 21, 2025
c0f393e
t push
mrnicegyu11 May 23, 2025
34a86fd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 2, 2025
df3f5df
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 3, 2025
ac44663
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 8, 2025
4100b87
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 21, 2025
759f657
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 21, 2025
d60fd0c
t checkout -b 2025/redactoMerge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 25, 2025
a1e36c7
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 30, 2025
b856eb0
Arch Linux Certificates Customization - 2
mrnicegyu11 Jul 30, 2025
81ce9fb
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 7, 2025
0e32699
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 19, 2025
a5b9950
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 25, 2025
70695e2
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 27, 2025
786a5d9
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Sep 10, 2025
03bc9ed
Improve loki, tempo, otel-collector
mrnicegyu11 Sep 10, 2025
d905648
enhancements
mrnicegyu11 Sep 10, 2025
4b13851
revert arch changes
mrnicegyu11 Sep 10, 2025
89d1d11
Remove hardcoded FQDN
mrnicegyu11 Sep 10, 2025
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 services/jaeger/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
memory: 64M
cpus: "0.1"
otel-collector:
image: otel/opentelemetry-collector-contrib:0.123.0
image: otel/opentelemetry-collector-contrib:0.135.0
configs:
- source: opentelemetry-collector-config
target: /etc/otel/config.yaml
Expand Down
5 changes: 5 additions & 0 deletions services/jaeger/opentelemetry-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ processors:
error_mode: ignore
traces:
span:
- attributes["http.route"] == "/health"
- attributes["http.target"] == "/socket.io/"
- attributes["url.path"] == "/socket.io/"
- attributes["server.address"] == "monitoring.osparc-master.speag.com"
- attributes["net.peer.name"] == "/var/run/docker.sock"
- attributes["http.route"] == "healthcheck_readiness_probe"
- attributes["http.route"] == "healthcheck_liveness_probe"
- attributes["http.target"] == "/metrics" and IsMatch(attributes["http.user_agent"], ".*Prometheus.*") == true
Expand Down
6 changes: 3 additions & 3 deletions services/logging/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ services:
start_period: 40s

loki:
image: grafana/loki:3.5.0
image: grafana/loki:3.5.4
configs:
- source: loki_config
target: /etc/loki/loki.yaml
Expand All @@ -160,8 +160,8 @@ services:
delay: 5s
resources:
limits:
cpus: '1.0'
memory: 2G
cpus: '2.0'
memory: 4G
reservations:
cpus: '0.5'
memory: 1G
Expand Down
24 changes: 20 additions & 4 deletions services/logging/loki.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
auth_enabled: false

server:
log_level: info
http_listen_port: 3100

grpc_server_max_recv_msg_size: 16777216 # 16MB (increase from 4MB default)
grpc_server_max_send_msg_size: 16777216 # 16MB
common:
path_prefix: /tmp/loki # Required for internal directories

Expand All @@ -29,16 +31,30 @@ storage_config:
active_index_directory: /tmp/loki/tsdb-index # Local cache for index metadata
cache_location: /tmp/loki/tsdb-cache # Local cache for tsdb
aws:
s3: s3://${S3_BUCKET_NAME_LOKI}
bucketnames: ${S3_BUCKET_NAME_LOKI}
region: ${S3_REGION_LOKI}
access_key_id: ${S3_ACCESS_KEY_LOKI}
secret_access_key: ${S3_SECRET_KEY_LOKI}
s3forcepathstyle: ${S3_FORCE_PATH_STYLE_LOKI} # Set to true if using MinIO or S3-compatible API; optional for AWS
endpoint: ${S3_ENDPOINT_LOKI} # Optional; use for non-default endpoints
endpoint: ${S3_ENDPOINT_LOKI}
s3forcepathstyle: true

compactor:
working_directory: /tmp/loki/compactor
retention_enabled: false

limits_config:
reject_old_samples: true
reject_old_samples_max_age: 4h
max_cache_freshness_per_query: 10m
split_queries_by_interval: 15m
# for big logs tune
per_stream_rate_limit: 512M
per_stream_rate_limit_burst: 1024M
cardinality_limit: 200000
ingestion_burst_size_mb: 1000
ingestion_rate_mb: 10000
max_entries_limit_per_query: 1000000
max_label_value_length: 20480
max_label_name_length: 10240
max_label_names_per_series: 300
retention_period: ${LOKI_RETENTION_PERIOD} # must be >= 24h and multiple of index period (24h)
6 changes: 3 additions & 3 deletions services/monitoring/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ services:
memory: 32M
cpus: "0.1"
tempo:
image: grafana/tempo:2.7.2
image: grafana/tempo:2.8.2
command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml"
configs:
- source: tempo_config
Expand All @@ -393,8 +393,8 @@ services:
- traefik.http.routers.tempo.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, tempo_replace_regex
resources:
limits:
memory: 2000M
cpus: "2.0"
memory: 4G
cpus: "5.0"

configs:
alertmanager_config:
Expand Down
8 changes: 4 additions & 4 deletions services/monitoring/tempo_config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ distributor:
log_discarded_spans:
enabled: true
include_all_attributes: false
#ingester:
# max_block_duration: 5m # cut the headblock when this much time passes. this should probably be left alone normally

ingester:
max_block_duration: 5m # cut the headblock when this much time passes. this should probably be left alone normally
trace_idle_period: 301s
compactor:
compaction:
block_retention: 96h # overall Tempo trace retention.
Expand Down Expand Up @@ -59,7 +59,7 @@ storage:
querier:
frontend_worker:
frontend_address: 0.0.0.0:9095

stream_over_http_enabled: true
overrides:
defaults:
metrics_generator:
Expand Down
Loading