From 0da83924d08d942592cb1699bc27723658f4fb2a Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Thu, 8 Aug 2024 19:43:39 +0800 Subject: [PATCH] update examples Signed-off-by: Weifeng Wang --- examples/grafana-beyla/beyla/beyla-config.yml | 3 ++- examples/grafana-beyla/compose.yaml | 2 +- examples/grafana-oncall/compose.override.yaml | 2 +- examples/grafana-oncall/compose.yaml | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/examples/grafana-beyla/beyla/beyla-config.yml b/examples/grafana-beyla/beyla/beyla-config.yml index 1dadd46d..583e238b 100644 --- a/examples/grafana-beyla/beyla/beyla-config.yml +++ b/examples/grafana-beyla/beyla/beyla-config.yml @@ -23,8 +23,9 @@ otel_metrics_export: report_peer: true features: - application - - application_service_graph - application_span + - application_service_graph + - application_process - network network: diff --git a/examples/grafana-beyla/compose.yaml b/examples/grafana-beyla/compose.yaml index 17d330db..fbbb32d8 100644 --- a/examples/grafana-beyla/compose.yaml +++ b/examples/grafana-beyla/compose.yaml @@ -20,7 +20,7 @@ services: # Beyla for NGINX gateway gateway-beyla: depends_on: { gateway: { condition: service_started } } - image: grafana/beyla:1.6.4 + image: grafana/beyla:1.7.0 volumes: - ./beyla/beyla-config.yml/:/configs/beyla-config.yml - ./sys-kernel-security:/sys/kernel/security diff --git a/examples/grafana-oncall/compose.override.yaml b/examples/grafana-oncall/compose.override.yaml index d44b0754..79135f71 100644 --- a/examples/grafana-oncall/compose.override.yaml +++ b/examples/grafana-oncall/compose.override.yaml @@ -10,4 +10,4 @@ services: GF_SECURITY_ADMIN_USER: oncall GF_SECURITY_ADMIN_PASSWORD: oncall GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-oncall-app, redis-app - GF_INSTALL_PLUGINS: grafana-oncall-app vv1.8.5, redis-app v2.2.1 \ No newline at end of file + GF_INSTALL_PLUGINS: grafana-oncall-app vv1.8.9, redis-app v2.2.1 \ No newline at end of file diff --git a/examples/grafana-oncall/compose.yaml b/examples/grafana-oncall/compose.yaml index fa3afcd4..252af473 100644 --- a/examples/grafana-oncall/compose.yaml +++ b/examples/grafana-oncall/compose.yaml @@ -63,7 +63,7 @@ services: condition: service_completed_successfully redis: condition: service_healthy - image: &oncallImage grafana/oncall:v1.8.5 + image: &oncallImage grafana/oncall:v1.8.9 restart: always ports: # - "8080" @@ -110,6 +110,11 @@ services: restart: always volumes: - redis_data:/data + deploy: + resources: + limits: + memory: 100m + cpus: "0.1" healthcheck: test: ["CMD", "redis-cli", "ping"] timeout: 5s