Create make collector target without NAP (#1055)

Author: john-david3

Makefile

@@ -231,12 +231,22 @@ build-mock-management-otel-collector-image: build-mock-management-otel-collector
 .PHONY: run-mock-management-otel-collector
 run-mock-management-otel-collector: ## Run mock management plane OTel collector
 	@echo "🚀 Running mock management plane OTel collector"
-	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP=nginx_plus_and_nap_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/docker-compose.yaml up -d
+	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP=nginx_plus_and_nap_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/nginx-plus-and-nap/docker-compose.yaml up -d
 
 .PHONY: stop-mock-management-otel-collector
 stop-mock-management-otel-collector: ## Stop running mock management plane OTel collector
 	@echo "Stopping mock management plane OTel collector"
-	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP=nginx_plus_and_nap_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/docker-compose.yaml down
+	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP=nginx_plus_and_nap_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/nginx-plus-and-nap/docker-compose.yaml down
+
+.PHONY: run-mock-otel-collector-without-nap
+run-mock-otel-collector-without-nap:
+	@echo "🚀 Running mock management plane OTel collector without NAP"
+	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/docker-compose.yaml up -d
+
+.PHONY: stop-mock-otel-collector-without-nap
+stop-mock-otel-collector-without-nap: ## Stop running mock management plane OTel collector
+	@echo "Stopping mock management plane OTel collector without NAP"
+	AGENT_IMAGE_WITH_NGINX_PLUS=nginx_plus_$(IMAGE_TAG):latest AGENT_IMAGE_WITH_NGINX_OSS=nginx_oss_$(IMAGE_TAG):latest $(CONTAINER_COMPOSE) -f ./test/mock/collector/docker-compose.yaml down
 
 generate: ## Generate golang code
 	@echo "🗄️ Generating proto files"

test/mock/collector/README.md

@@ -14,6 +14,11 @@ make local-deb-package build-test-oss-image build-test-plus-image build-mock-man
 
 [**Note:** We need to build the test NGINX Plus with NAP image with the environment variable `OSARCH=amd64` since NGINX App Protect doesn't support ARM yet.]
 
+To build all images except the NGINX Plus & NGINX App Protect run the following
+```
+make local-deb-package build-test-oss-image build-test-plus-image build-mock-management-otel-collector-image
+```
+
 To start run everything run the following
 ```
 make run-mock-management-otel-collector

test/mock/collector/docker-compose.yaml

@@ -7,16 +7,6 @@ volumes:
   grafana-storage:
 
 services:
-  agent-with-nginx-plus-and-nap:
-    image: ${AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP}
-    container_name: mock-collector-agent-with-nginx-plus-and-nap
-    volumes:
-      - ./nginx-agent.conf:/etc/nginx-agent/nginx-agent.conf
-      - ./nginx-plus-and-nap/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx-plus-and-nap/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      - metrics
-
   agent-with-nginx-plus:
     image: ${AGENT_IMAGE_WITH_NGINX_PLUS}
     container_name: mock-collector-agent-with-nginx-plus

test/mock/collector/nginx-plus-and-nap/docker-compose.yaml

@@ -0,0 +1,90 @@
+
+networks:
+  metrics:
+    driver: bridge
+
+volumes:
+  grafana-storage:
+
+services:
+  agent-with-nginx-plus-and-nap:
+    image: ${AGENT_IMAGE_WITH_NGINX_PLUS_AND_NAP}
+    container_name: mock-collector-agent-with-nginx-plus-and-nap
+    volumes:
+      - ../nginx-agent.conf:/etc/nginx-agent/nginx-agent.conf
+      - ../nginx-plus-and-nap/nginx.conf:/etc/nginx/nginx.conf
+      - ../nginx-plus-and-nap/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - metrics
+
+  agent-with-nginx-plus:
+    image: ${AGENT_IMAGE_WITH_NGINX_PLUS}
+    container_name: mock-collector-agent-with-nginx-plus
+    volumes:
+      - ../nginx-agent.conf:/etc/nginx-agent/nginx-agent.conf
+      - ../nginx-plus/nginx.conf:/etc/nginx/nginx.conf
+      - ../nginx-plus/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - metrics
+
+  agent-with-nginx-oss:
+    image: ${AGENT_IMAGE_WITH_NGINX_OSS}
+    container_name: mock-collector-agent-with-nginx-oss
+    volumes:
+      - ../nginx-agent.conf:/etc/nginx-agent/nginx-agent.conf
+      - ../nginx-oss:/etc/nginx/
+    networks:
+      - metrics
+
+  otel-collector:
+    image: mock-collector
+    container_name: mock-collector-otel-collector
+    ports:
+      - 4320:4317
+      - 9775:9090
+    volumes:
+      - ../otel-collector.yaml:/etc/otel-collector.yaml
+    networks:
+      - metrics
+
+  prometheus:
+    image: prom/prometheus:latest
+    container_name: mock-collector-prometheus
+    restart: unless-stopped
+    ports:
+      - "9090:9090"
+    volumes:
+      - ../prometheus.yaml:/etc/prometheus/prometheus.yml
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    networks:
+      - metrics
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: mock-collector-grafana
+    restart: unless-stopped
+    environment:
+      GF_INSTALL_PLUGINS: "grafana-lokiexplore-app"
+    ports:
+      - "3002:3000"
+    volumes:
+      - grafana-storage:/var/lib/grafana
+      - ../grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
+      - ../grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards
+      - ../grafana/provisioning/plugins:/etc/grafana/provisioning/plugins
+      - ../grafana/provisioning/dashboards:/var/lib/grafana/dashboards
+    networks:
+      - metrics
+
+  loki:
+    image: grafana/loki:latest
+    container_name: mock-collector-loki
+    restart: unless-stopped
+    ports:
+      - "3100:3100"
+    volumes:
+      - ../loki-config.yaml:/etc/loki/local-config.yaml
+    command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      - metrics