diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a96c94e8d..d31feb573c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -264,7 +264,7 @@ jobs: env: GO_VERSION: ${{ env.GO_VERSION }} with: - file: scripts/testing/load/Dockerfile + file: test/docker/load/Dockerfile tags: nginx-agent-load-test:1.0.0 context: '.' push: false diff --git a/Makefile b/Makefile index b08795cae2..5d7b211ed2 100644 --- a/Makefile +++ b/Makefile @@ -271,7 +271,7 @@ generate-pgo-profile: build-mock-management-plane-grpc load-test-image: ## Build performance load testing image @echo "🚚 Running load tests" $(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build -t $(IMAGE_TAG)_load_test . \ - --no-cache -f ./scripts/testing/load/Dockerfile \ + --no-cache -f ./test/docker/load/Dockerfile \ --secret id=nginx-crt,src=$(CERTS_DIR)/nginx-repo.crt \ --secret id=nginx-key,src=$(CERTS_DIR)/nginx-repo.key \ --build-arg OSARCH=$(OSARCH) \ diff --git a/scripts/testing/docker-compose_otel-collector.yaml b/scripts/testing/docker-compose_otel-collector.yaml deleted file mode 100644 index efaa57d1b9..0000000000 --- a/scripts/testing/docker-compose_otel-collector.yaml +++ /dev/null @@ -1,62 +0,0 @@ -version: '3.9' - -networks: - monitoring: - driver: bridge - -volumes: - prometheus_data: {} - victoriametrics_data: {} - -services: - otel-collector: - image: otel/opentelemetry-collector - container_name: collector - restart: always - command: ["--config=/etc/otel-collector-config.yaml"] - volumes: - - ./otel-collector.yaml:/etc/otel-collector-config.yaml - ports: - - "1888:1888" # pprof extension - - "13133:13133" # health_check extension - - "4317:4317" # OTLP/2 gRPC receiver - - "4318:4318" # OTLP/2 http receiver - - "55679:55679" # zpages extension - - "8889:8889" # prometheus exporter - networks: - - monitoring - - prometheus: - image: prom/prometheus:latest - container_name: prometheus - volumes: - - ./prometheus.yaml:/etc/prometheus/prometheus.yml - - prometheus_data:/prometheus - command: - - '--config.file=/etc/prometheus/prometheus.yml' - - '--storage.tsdb.path=/prometheus' - - '--web.enable-lifecycle' - - '--log.level=debug' - ports: - - "9090:9090" - networks: - - monitoring - depends_on: - - otel-collector - - victoriametrics: - image: victoriametrics/victoria-metrics:latest - container_name: victoriametrics - volumes: - - victoriametrics_data:/victoria-metrics-data - command: - - '--graphiteListenAddr=:2003' - - '--opentsdbListenAddr=:4242' - - '--httpListenAddr=:8428' - - '--retentionPeriod=12' - ports: - - "8428:8428" - networks: - - monitoring - depends_on: - - prometheus diff --git a/scripts/testing/otel-collector.yaml b/scripts/testing/otel-collector.yaml deleted file mode 100644 index 6196a1591b..0000000000 --- a/scripts/testing/otel-collector.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md -receivers: - otlp/2: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - http: - endpoint: 0.0.0.0:4318 - - # prometheus: - # config: - # scrape_configs: - # - job_name: 'otel-collector' - # scrape_interval: 5s - # static_configs: - # - targets: ['192.168.59.101:30882'] - -processors: - batch: - timeout: 1s - -exporters: - logging: - verbosity: detailed - sampling_initial: 5 - sampling_thereafter: 200 - prometheus: - endpoint: "0.0.0.0:8889" - # otlphttp: - # endpoint: http://victoriametrics:8428/opentelemetry/api/v1/push - -extensions: - health_check: - endpoint: 0.0.0.0:13133 - pprof: - endpoint: 0.0.0.0:1888 - zpages: - endpoint: 0.0.0.0:55679 - -service: - extensions: [pprof, health_check, zpages] - pipelines: - # traces: - # receivers: [otlp] - # # processors: [batch] - # exporters: [otlphttp, logging] - metrics: - receivers: [otlp/2] - processors: [batch] - # Deprecated component. Will be removed in future releases. {"kind": "exporter", "data_type": "metrics", "name": "logging"} - exporters: [logging, prometheus] - # exporters: [logging, otlphttp] diff --git a/scripts/testing/prometheus.yaml b/scripts/testing/prometheus.yaml deleted file mode 100644 index 4815189055..0000000000 --- a/scripts/testing/prometheus.yaml +++ /dev/null @@ -1,11 +0,0 @@ -global: - scrape_interval: 15s - -scrape_configs: - - job_name: 'otel-collector' - scrape_interval: 5s - static_configs: - - targets: ['otel-collector:8889'] # Ensure this matches the OTel Collector's Prometheus metrics port - -remote_write: - - url: "http://victoriametrics:8428/api/v1/write" diff --git a/scripts/testing/load/Dockerfile b/test/docker/load/Dockerfile similarity index 100% rename from scripts/testing/load/Dockerfile rename to test/docker/load/Dockerfile