Skip to content

Commit

Permalink
Merge branch 'main' into php-ga
Browse files Browse the repository at this point in the history
austinlparker authored Nov 6, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 2ebbfde + 46711eb commit fc14052
Showing 30 changed files with 3,009 additions and 6,168 deletions.
10 changes: 5 additions & 5 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
@@ -463,7 +463,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.50
image: jaegertracing/all-in-one:1.51
container_name: jaeger
command:
- "--memory.max-traces=8000"
@@ -485,7 +485,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:10.1.2
image: grafana/grafana:10.2.0
container_name: grafana
deploy:
resources:
@@ -502,7 +502,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.86.0
image: otel/opentelemetry-collector-contrib:0.88.0
container_name: otel-col
deploy:
resources:
@@ -524,7 +524,7 @@ services:

# Prometheus
prometheus:
image: quay.io/prometheus/prometheus:v2.47.0
image: quay.io/prometheus/prometheus:v2.47.2
container_name: prometheus
command:
- --web.console.templates=/etc/prometheus/consoles
@@ -685,7 +685,7 @@ services:
condition: service_started

tracetest-server:
image: kubeshop/tracetest:v0.13.10
image: kubeshop/tracetest:v0.14.5
platform: linux/amd64
container_name: tracetest-server
profiles:
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -607,7 +607,7 @@ services:
# ********************
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.50
image: jaegertracing/all-in-one:1.51
container_name: jaeger
command:
- "--memory.max-traces=8000"
@@ -629,7 +629,7 @@ services:

# Grafana
grafana:
image: grafana/grafana:10.1.2
image: grafana/grafana:10.2.0
container_name: grafana
deploy:
resources:
@@ -646,7 +646,7 @@ services:

# OpenTelemetry Collector
otelcol:
image: otel/opentelemetry-collector-contrib:0.86.0
image: otel/opentelemetry-collector-contrib:0.88.0
container_name: otel-col
deploy:
resources:
@@ -668,7 +668,7 @@ services:

# Prometheus
prometheus:
image: quay.io/prometheus/prometheus:v2.47.0
image: quay.io/prometheus/prometheus:v2.47.2
container_name: prometheus
command:
- --web.console.templates=/etc/prometheus/consoles
@@ -832,7 +832,7 @@ services:
condition: service_started

tracetest-server:
image: kubeshop/tracetest:v0.13.10
image: kubeshop/tracetest:v0.14.5
platform: linux/amd64
container_name: tracetest-server
profiles:
142 changes: 71 additions & 71 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"devDependencies": {
"markdown-link-check": "^3.9.3",
"markdown-toc": "^1.2.0",
"markdownlint-cli": "0.35.0",
"markdownlint-cli": "0.37.0",
"@kt3k/license-checker": "^3.2.2"
}
}
Loading

0 comments on commit fc14052

Please sign in to comment.