Unverified Commit 05c923df authored by Prashant Shahi's avatar Prashant Shahi Committed by GitHub
Browse files

chore: :pushpin: pin alertmanager and otelcollector version and changes (#1048)

Signed-off-by: default avatarPrashant Shahi <prashant@signoz.io>
parent 90637212
develop 1244-edit-alert 1725-expection 24-may-2022-testing 414-uri ankit01-oss-patch-1 bump-json-iterator bump-prometheus chore/analytics chore/change-validation-message chore/improve-metrics-perf chore/remove-query-service-codeowners dashboarad-vars effgo feat-doc-contribute feat/amol-ee feat/custom-func-getSubTreeSpans feat/dynamic-tooltip feat/ee feat/featureFlagging feat/fields-compression feat/gh-bot feat/searchTraceId feat/udf-function-getSubTreeSpans feat/usage feat/usage-reporting fix-double-client fix/error-exception-page-typo fix/error-exception-sql-issue fix/errorDetailURL fix/exceptionPageOptimization fix/null-values fix/setTTLapis issue-1228 issue-1252 issue-1293 issue-1294 issue-1442 issue-1485-develop issue-1511 issue-1583 issue-618 issue-pod-687 labels_object main metrics-builder-all metrics-table new-metrics new-metrics-enums palashgdev-patch-1 palashgdev-patch-2 perf/trace-detail-page playwright prashant/frontend-docker prashant/nginx-cache-improvement release/v0.10 release/v0.10.0 release/v0.10.1 release/v0.10.2 release/v0.11 release/v0.11.0 release/v0.11.1 release/v0.11.2 release/v0.11.3 release/v0.8 release/v0.8.0 release/v0.8.1 release/v0.8.2 release/v0.9 release/v0.9.0 release/v0.9.1 release/v0.9.2 snyk-fix-3d7b28e56a36018c4b5cf8438365ff27 snyk-fix-4ef12a6988dec7696867e0b2accb8289 snyk-fix-7ee2560cd9d67a9821899135c05c1175 trace-search ttl-plus wip-release-0.11.1 v0.11.3 v0.11.3-rc.1 v0.11.2 v0.11.2-rc.3 v0.11.2-rc.2 v0.11.2-rc.1 v0.11.1 v0.11.1-rc.1 v0.11.0 v0.11.0-rc.1 v0.11 v0.10.2 v0.10.1 v0.10.1-rc.1 v0.10.0 v0.10.0-rc2 v0.10.0-rc1 v0.10 v0.9.2 v0.9.2-rc1 v0.9.1 v0.9.0 v0.9.0-rc2 v0.9.0-rc1 v0.9 v0.8.2 v0.8.1 v0.8.1-rc5 v0.8.1-rc4 v0.8.1-rc3 v0.8.1-rc2 v0.8.1-rc1 v0.8.0 v0.8.0-rc6 v0.8.0-rc5 v0.8.0-rc4 v0.8.0-rc3 v0.8.0-rc2 v0.8.0-rc1 v0.8
No related merge requests found
Showing with 32 additions and 32 deletions
+32 -32
......@@ -4,8 +4,8 @@ services:
clickhouse:
image: yandex/clickhouse-server:21.12.3.32
# ports:
# - "9000:9000"
# - "8123:8123"
# - "9000:9000"
# - "8123:8123"
volumes:
- ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
- ./data/clickhouse/:/var/lib/clickhouse/
......@@ -22,7 +22,7 @@ services:
retries: 3
alertmanager:
image: signoz/alertmanager:0.6.1
image: signoz/alertmanager:0.23.0-0.1
volumes:
- ./data/alertmanager:/data
depends_on:
......@@ -36,7 +36,7 @@ services:
# Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
query-service:
image: signoz/query-service:0.7.5
image: signoz/query-service:develop
container_name: query-service
command: ["-config=/root/config/prometheus.yml"]
volumes:
......@@ -60,7 +60,7 @@ services:
condition: service_healthy
frontend:
image: signoz/frontend:0.7.5
image: signoz/frontend:develop
container_name: frontend
restart: on-failure
depends_on:
......@@ -72,7 +72,7 @@ services:
- ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector:
image: signoz/otelcontribcol:trace-optimized-v1
image: signoz/otelcontribcol:0.43.0-0.1
command: ["--config=/etc/otel-collector-config.yaml"]
volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
......@@ -93,7 +93,7 @@ services:
condition: service_healthy
otel-collector-metrics:
image: signoz/otelcontribcol:trace-optimized-v1
image: signoz/otelcontribcol:0.43.0-0.1
command: ["--config=/etc/otel-collector-metrics-config.yaml"]
volumes:
- ./otel-collector-metrics-config.yaml:/etc/otel-collector-metrics-config.yaml
......@@ -102,28 +102,28 @@ services:
clickhouse:
condition: service_healthy
# hotrod:
# image: jaegertracing/example-hotrod:1.30
# container_name: hotrod
# logging:
# options:
# max-size: 50m
# max-file: "3"
# command: ["all"]
# environment:
# - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
hotrod:
image: jaegertracing/example-hotrod:1.30
container_name: hotrod
logging:
options:
max-size: 50m
max-file: "3"
command: ["all"]
environment:
- JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
# load-hotrod:
# image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
# container_name: load-hotrod
# hostname: load-hotrod
# environment:
# ATTACKED_HOST: http://hotrod:8080
# LOCUST_MODE: standalone
# NO_PROXY: standalone
# TASK_DELAY_FROM: 5
# TASK_DELAY_TO: 30
# QUIET_MODE: "${QUIET_MODE:-false}"
# LOCUST_OPTS: "--headless -u 10 -r 1"
# volumes:
# - ../common/locust-scripts:/locust
load-hotrod:
image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
container_name: load-hotrod
hostname: load-hotrod
environment:
ATTACKED_HOST: http://hotrod:8080
LOCUST_MODE: standalone
NO_PROXY: standalone
TASK_DELAY_FROM: 5
TASK_DELAY_TO: 30
QUIET_MODE: "${QUIET_MODE:-false}"
LOCUST_OPTS: "--headless -u 10 -r 1"
volumes:
- ../common/locust-scripts:/locust
......@@ -44,4 +44,4 @@ service:
metrics:
receivers: [otlp, prometheus]
processors: [batch]
exporters: [clickhousemetricswrite]
\ No newline at end of file
exporters: [clickhousemetricswrite]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment