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.

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

Remove unused code #2

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Changes from all commits
Commits
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
Remove unused code
  • Loading branch information
noellrr committed Apr 29, 2024
commit aa79666b9055e85265d1b0fcf25edc87fc745729
118 changes: 1 addition & 117 deletions sample/otel-in-action/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,6 @@ services:
- POSTGRES_USER=matthias
- POSTGRES_DB=mydb


# todobackend-springboot:
# image: todobackend:v2402
# networks:
# - todonet
# build:
# context: ./todobackend-springboot
# dockerfile: Dockerfile
# ports:
# - "8080:8080"
# restart: unless-stopped
# environment:
# - SPRING_PROFILES_ACTIVE=prod
# - OTEL_EXPORTER_OTLP_ENDPOINT=http:https://jaeger:4318 # http endpoint
# - OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
# - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
# - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
# - OTEL_EXPORTER_OTLP_METRICS_PROTOCOL=grpc
# - OTEL_RESOURCE_ATTRIBUTES=service.name=todobackend-springboot
# - OTEL_METRICS_EXPORTER=otlp,logging-otlp
# - OTEL_LOGS_EXPORTER=none
# depends_on:
# - postgresdb

todobackend-django:

build:
Expand Down Expand Up @@ -105,96 +81,4 @@ services:
build:
context: ./loadgenerator
networks:
- todonet


# ### OTEL PART

# # jaegercol:
# # image: jaegertracing/all-in-one:latest
# # environment:
# # - COLLECTOR_OTLP_ENABLED=true
# # ports:
# # - "16686:16686"
# # - "4317:4317"

# jaeger:
# image: ${JAEGERTRACING_IMAGE}
# networks:
# - todonet
# command:
# - "--memory.max-traces=5000"
# - "--prometheus.server-url=http:https://prometheus:9090"
# - "--prometheus.query.normalize-calls=true"
# - "--prometheus.query.normalize-duration=true"
# # - "--query.base-path=/jaeger/ui"
# ports:
# - "16686:16686"
# deploy:
# resources:
# limits:
# memory: 400M
# restart: unless-stopped
# environment:
# - METRICS_STORAGE_TYPE=prometheus

# otelcol:
# image: ${COLLECTOR_CONTRIB_IMAGE}
# restart: unless-stopped
# networks:
# - todonet
# command: ["--config=/etc/otel-collector-config.yml", ""]
# volumes:
# - ./collector/otel-collector-config.yml:/etc/otel-collector-config.yml
# ports:
# - "4317:4317" # OTLP gRPC receiver
# - "4318:4318"
# depends_on:
# - jaeger

# # Prometheus
# prometheus:
# image: ${PROMETHEUS_IMAGE}
# networks:
# - todonet
# command:
# - --web.console.templates=/etc/prometheus/consoles
# - --web.console.libraries=/etc/prometheus/console_libraries
# - --storage.tsdb.retention.time=1h
# - --config.file=/etc/prometheus/prometheus-config.yaml
# - --storage.tsdb.path=/prometheus
# - --web.enable-lifecycle
# - --web.route-prefix=/
# - --enable-feature=exemplar-storage
# - --enable-feature=otlp-write-receiver
# volumes:
# - ./prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml
# deploy:
# resources:
# limits:
# memory: 300M
# restart: unless-stopped
# ports:
# - "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"




# # opensearch:
# # image: ${OPENSEARCH_IMAGE}
# # container_name: opensearch
# # deploy:
# # resources:
# # limits:
# # memory: 1G
# # restart: unless-stopped
# # environment:
# # - cluster.name=demo-cluster
# # - node.name=demo-node
# # - bootstrap.memory_lock=true
# # - discovery.type=single-node
# # - OPENSEARCH_JAVA_OPTS=-Xms300m -Xmx300m
# # - DISABLE_INSTALL_DEMO_CONFIG=true
# # - DISABLE_SECURITY_PLUGIN=true
# # ports:
# # - "9200:9200"
- todonet