Removed Application Delivery Manger, tested with NGINX Instance Manager 2.15.0 (#127)

* Added API Connectivity Manager 1.5.0 support

* Ownership fix

* Startup script fix

* NGINX App Protect WAF updates

* Tested with NGINX Instance Manager 2.9.1

* Added docker-compose support

* Tested with NGINX Instance Manager 2.10.0 and Security Monitoring 1.4.0

* Tested with NGINX Instance Manager 2.10.0 and API Connectivity Manager 1.5.0

* Tested with API Connectivity Manager 1.6.0

* Tested with API Connectivity Manager 1.6.0

* README updated

* Added support for NGINX Instance Manager 2.10.1 and App Delivery Manager 4.0.0

* Fixed NGINX App Protect detection bug for NGINX Instance Manager 2.10.0+

* Fixed agent syslog receiver bug

* README updated

* Tested with NGINX Instance Manager 2.11.0 and Security Monitoring 1.5.0

* Tested with NGINX Instance Manager 2.11.0

* Tested with NGINX API Connectivity Manager 1.7.0

* Tested with NGINX Instance Manager 2.12.0 and Security Monitoring 1.6.0

* Tested with API Connectivity Manager 1.8.0

* Tested with API Connectivity Manager 1.8.0

* Tested with NGINX Instance Manager 2.12.0

* Dockerfile updated

* Support for NGINX Instance Manager 2.13

* Tested with NGINX Instance Manager 2.13

* Tested with NIM 2.14.0 and SM 1.7.0

* Tested with NIM 2.14.0 and SM 1.7.0

* Tested with NGINX Instance Manager 2.14.0

* Tested with NGINX Instance Manager 2.14.0

* Tested with NGINX App Protect compiler v4.583.0

* Start script updated

* Advanced metrics support added

* Advanced metrics support added

* Removed Application Delivery Manger, tested with NGINX Instance Manager 2.15.0

---------

Signed-off-by: 65397 <[email protected]>

Author: fabriziofiorucci

nginx-agent-docker/Dockerfile

@@ -1,7 +1,6 @@
 FROM debian:bullseye-slim
 
 ARG NMS_URL
-ARG DEVPORTAL=false
 ARG NAP_WAF=false
 
 # Initial packages setup
@@ -30,16 +29,6 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 	&& apt-get -y update \
 	&& apt-get -y install app-protect app-protect-attack-signatures; fi \
 
-# Optional API Connectivity Manager DevPortal
-# https://docs.nginx.com/nginx-management-suite/admin-guides/installation/on-prem/install-guide/
-	&& if [ "$DEVPORTAL" = "true" ] ; then \
-	printf "deb https://pkgs.nginx.com/nms/debian `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nms.list \
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 \
-	&& apt-get -y update \
-	&& apt-get -y install nginx-devportal nginx-devportal-ui \
-	&& echo 'DB_TYPE="sqlite"' >> /etc/nginx-devportal/devportal.conf \
-	&& echo 'DB_PATH="/var/lib/nginx-devportal"' >> /etc/nginx-devportal/devportal.conf; fi \
-
 # Forward request logs to Docker log collector
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log \

nginx-agent-docker/README.md

@@ -8,8 +8,7 @@ This repository can be used to build a docker image with NGINX Plus and NGINX In
 
 This repository has been tested with NGINX agent for:
 
-- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.10.0, 2.10.1, 2.11.0, 2.12.0, 2.13.0, 2.13.1, 2.14.0, 2.14.1
-- API Connectivity Manager 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.8.0, 1.9.0
+- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.10.0, 2.10.1, 2.11.0, 2.12.0, 2.13.0, 2.13.1, 2.14.0, 2.14.1, 2.15.0
 - NGINX App Protect WAF 4.100.1+
 
 ## Prerequisites
@@ -41,19 +40,15 @@ NGINX Plus & NGINX Instance Manager agent Docker image builder
  -C [file.crt]          - Certificate to pull packages from the official NGINX repository
  -K [file.key]          - Key to pull packages from the official NGINX repository
  -n [URL]               - NGINX Instance Manager URL to fetch the agent
- -d                     - Build support for NGINX API Gateway Developer Portal
  -w                     - Add NGINX App Protect WAF
 
  === Examples:
 
  NGINX Plus and NGINX Agent image:
- ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28 -n https://nim.f5.ff.lan
+ ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:latest -n https://nim.f5.ff.lan
 
  NGINX Plus, NGINX App Protect WAF and NGINX Agent image:
- ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28-nap -w -n https://nim.f5.ff.lan
-
- NGINX Plus, Developer Portal support and NGINX Agent image:
- ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28-devportal -d -n https://nim.f5.ff.lan 
+ ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:latest-nap -w -n https://nim.f5.ff.lan
 ```
 
 1. Clone this repository
@@ -67,7 +62,6 @@ $ ./scripts/build.sh -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:3100
 
 the build script will push the image to your private registry once build is complete.
 
-- the `-d` flag can be used to build a Docker image to run NGINX Plus in [Developer Portal](https://docs.nginx.com/nginx-management-suite/admin-guides/installation/on-prem/install-guide/#install-developer-portal) mode for [API Connectivity Manager](https://docs.nginx.com/nginx-management-suite/acm/about/architecture/)
 - the `-w` flag can be used to include NGINX App Protect WAF support in the docker image
 
 ### Running the docker image on Kubernetes
@@ -80,7 +74,6 @@ the build script will push the image to your private registry once build is comp
   - `NIM_ADVANCED_METRICS` - set to `"true"` to enable advanced metrics collection
   - `NAP_WAF` - set to `"true"` to enable NGINX App Protect WAF (docker image built using `-w`)
   - `NAP_WAF_PRECOMPILED_POLICIES` - set to `"true"` to enable NGINX App Protect WAF precompiled policies (docker image built using `-w`)
-  - `ACM_DEVPORTAL` - set to `"true"` to enable API Connectivity Manager Developer Portal (docker image built using `-d`)
 
 2. Start and stop using
 
@@ -97,13 +90,10 @@ $ ./scripts/nginxWithAgentStart.sh stop
 
 ```
 NGINX Plus and NGINX Agent
-docker run --name nginx-plus -d -e "NIM_HOST=<NIM_FQDN_OR_IP>" -e "NIM_GRPC_PORT=<GPRC_PORT>" -d registry.ff.lan:31005/nginx-with-agent:r28
+docker run --name nginx-plus -d -e "NIM_HOST=<NIM_FQDN_OR_IP>" -e "NIM_GRPC_PORT=<GPRC_PORT>" -d registry.ff.lan:31005/nginx-with-agent:latest
 
 NGINX Plus, NGINX Agent and NGINX App Protect WAF with precompiled policies
-docker run --name nginx-plus -d -e "NIM_HOST=<NIM_FQDN_OR_IP>" -e "NIM_GRPC_PORT=<GPRC_PORT>" -e "NAP_WAF=true" -e "NAP_WAF_PRECOMPILED_POLICIES=true" -d registry.ff.lan:31005/nginx-with-agent:r28-nap
-
-NGINX Plus, NGINX Agent and Developer portal
-docker run --name nginx-plus -d -e "NIM_HOST=<NIM_FQDN_OR_IP>" -e "NIM_GRPC_PORT=<GPRC_PORT>" -e "ACM_DEVPORTAL=true" -d registry.ff.lan:31005/nginx-with-agent:r28-devportal
+docker run --name nginx-plus -d -e "NIM_HOST=<NIM_FQDN_OR_IP>" -e "NIM_GRPC_PORT=<GPRC_PORT>" -e "NAP_WAF=true" -e "NAP_WAF_PRECOMPILED_POLICIES=true" -d registry.ff.lan:31005/nginx-with-agent:latest-nap
 ```
 
 2. After startup NGINX Plus instances will register to NGINX Instance Manager and will be displayed on the "instances" dashboard

nginx-agent-docker/container/start.sh

@@ -105,8 +105,4 @@ extensions:
 __EOT__
 fi
 
-if [[ "$ACM_DEVPORTAL" == "true" ]]; then
-   nginx-devportal server &
-fi
-
 sg nginx-agent "/usr/bin/nginx-agent $PARM"

nginx-agent-docker/scripts/build.sh

@@ -12,18 +12,14 @@ $0 [options]\n\n
 -C [file.crt]\t\t- Certificate to pull packages from the official NGINX repository\n
 -K [file.key]\t\t- Key to pull packages from the official NGINX repository\n
 -n [URL]\t\t- NGINX Instance Manager URL to fetch the agent\n
--d\t\t\t- Build support for NGINX API Gateway Developer Portal\n
 -w\t\t\t- Add NGINX App Protect WAF\n\n
 === Examples:\n\n
 NGINX Plus and NGINX Agent image:\n
-  $0 -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28 -n https://nim.f5.ff.lan\n\n
+  $0 -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:latest -n https://nim.f5.ff.lan\n\n
 NGINX Plus, NGINX App Protect WAF and NGINX Agent image:\n
-  $0 -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28-nap -w -n https://nim.f5.ff.lan\n\n
-NGINX Plus, Developer Portal support and NGINX Agent image:\n
-  $0 -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:r28-devportal -d -n https://nim.f5.ff.lan
-\n"
+  $0 -C nginx-repo.crt -K nginx-repo.key -t registry.ff.lan:31005/nginx-with-agent:latest-nap -w -n https://nim.f5.ff.lan\n"
 
-while getopts 'ht:C:K:a:n:dw' OPTION
+while getopts 'ht:C:K:a:n:w' OPTION
 do
 	case "$OPTION" in
 		h)
@@ -42,9 +38,6 @@ do
 		n)
 			NMSURL=$OPTARG
 		;;
-		d)
-			DEVPORTAL=true
-		;;
 		w)
 			NAP_WAF=true
 		;;
@@ -77,19 +70,14 @@ fi
 
 echo "=> Target docker image is $IMAGENAME"
 
-if [ ! -z "${DEVPORTAL}" ]
-then
-echo "=> Building with Developer Portal support"
-fi
-
 if [ ! -z "${NAP_WAF}" ]
 then
 echo "=> Building with NGINX App Protect WAF support"
 fi
 
 DOCKER_BUILDKIT=1 docker build --no-cache -f Dockerfile \
 	--secret id=nginx-key,src=$NGINX_KEY --secret id=nginx-crt,src=$NGINX_CERT \
-	--build-arg NMS_URL=$NMSURL --build-arg DEVPORTAL=$DEVPORTAL --build-arg NAP_WAF=$NAP_WAF -t $IMAGENAME .
+	--build-arg NMS_URL=$NMSURL --build-arg NAP_WAF=$NAP_WAF -t $IMAGENAME .
 
 echo "=> Build complete for $IMAGENAME"
 docker push $IMAGENAME

nginx-nms-docker/Dockerfile.automated

@@ -4,7 +4,6 @@ ARG BUILD_WITH_SECONDSIGHT=false
 ARG ADD_ACM
 ARG ADD_SM
 ARG ADD_PUM
-ARG ADD_ADM
 
 # Initial setup
 RUN apt-get update && \
@@ -19,7 +18,6 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 	set -x \
 	&& chmod +x /deployment/startNIM.sh \
 	&& printf "deb https://pkgs.nginx.com/nms/ubuntu `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nms.list \
-	&& printf "deb https://pkgs.nginx.com/adm/ubuntu `lsb_release -cs` nginx-plus\n" >> /etc/apt/sources.list.d/nms.list \
 	&& wget -q -O /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx \
 	&& wget -O /tmp/nginx_signing.key https://cs.nginx.com/static/keys/nginx_signing.key \
 	&& apt-key add /tmp/nginx_signing.key \
@@ -35,9 +33,6 @@ RUN --mount=type=secret,id=nginx-crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644
 	# Optional WAF Policy Compiler
 	&& if [ ! -z "${ADD_PUM}" ] ; then \
 	apt-get -y install nms-nap-compiler-$ADD_PUM; fi \
-	# Optional App Delivery Manager
-	&& if [ ! -z "${ADD_ADM}" ] ; then \
-	apt-get -y install nms-app-delivery-manager; fi \
 	# Set permissions
 	&& chmod +x /etc/nms/scripts/*.sh \
 	&& wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \

nginx-nms-docker/README.md

@@ -10,7 +10,6 @@ Docker image creation is supported for:
 - [NGINX API Connectivity Manager](https://docs.nginx.com/nginx-management-suite/acm/) 1.0.0+
 - [Security Monitoring](https://docs.nginx.com/nginx-management-suite/security/) 1.0.0+
 - [NGINX App Protect WAF compiler](https://docs.nginx.com/nginx-management-suite/nim/how-to/app-protect/setup-waf-config-management)
-- [NGINX App Delivery Manager](https://docs.nginx.com/nginx-management-suite/adm/) 4.0.0+
 
 The image can optionally be built with [Second Sight](https://github.com/F5Networks/SecondSight) support
 
@@ -24,11 +23,10 @@ A bash script to quickly install NGINX Management Suite through the official Hel
 
 This repository has been tested with:
 
-- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.9.1, 2.10.0, 2.10.1, 2.11.0, 2.12.0, 2.13.0, 2.13.1, 2.14.0
+- NGINX Instance Manager 2.4.0, 2.5.0, 2.5.1, 2.6.0, 2.7.0, 2.8.0, 2.9.0, 2.9.1, 2.10.0, 2.10.1, 2.11.0, 2.12.0, 2.13.0, 2.13.1, 2.14.0, 2.14.1, 2.15.0
 - NGINX API Connectivity Manager 1.0.0, 1.1.0, 1.1.1, 1.2.0, 1.3.0, 1.3.1, 1.4.0, 1.4.1, 1.5.0, 1.6.0, 1.7.0, 1.8.0, 1.9.0, 1.9.1
-- Security Monitoring 1.0.0, 1.1.0, 1.2.0, 1.3.0, 1.4.0, 1.5.0, 1.6.0, 1.7.0
+- Security Monitoring 1.0.0, 1.1.0, 1.2.0, 1.3.0, 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.7.1
 - NGINX App Protect WAF compiler v3.1088.2, v4.100.1, v4.2.0, v4.218.0, v4.279.0, v4.402.0, v4.457.0, v4.583.0
-- NGINX App Delivery Manager 4.0.0
 
 ## Prerequisites
 
@@ -47,7 +45,7 @@ This repository has been tested with:
 The install script can be used to build the Docker image using automated or manual install:
 
 ```
-$ ./scripts/buildNIM.sh 
+$ ./scripts/buildNIM.sh
 NGINX Management Suite Docker image builder
 
  This tool builds a Docker image to run NGINX Management Suite
@@ -77,7 +75,6 @@ NGINX Management Suite Docker image builder
  -A                     - Enable API Connectivity Manager - optional
  -W                     - Enable Security Monitoring - optional
  -P [version]           - Enable WAF policy compiler, version can be any [v3.1088.2|v4.100.1|v4.2.0|v4.218.0|v4.279.0|v4.402.0|v4.457.0|v4.583.0] - optional
- -D                     - Enable App Delivery Manager - optional
 
  === Examples:
 
@@ -90,7 +87,7 @@ NGINX Management Suite Docker image builder
 
  Automated build:
         ./scripts/buildNIM.sh -i -C nginx-repo.crt -K nginx-repo.key
-                -A -W -P v4.583.0 -D -t my.registry.tld/nginx-nms:2.14.1
+                -A -W -P v4.583.0 -t my.registry.tld/nginx-nms:latest
 ```
 
 ### Automated build
@@ -102,31 +99,25 @@ NGINX Management Suite Docker image builder
 NGINX Instance Manager
 
 ```
-./scripts/buildNIM.sh -t registry.ff.lan:31005/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key
+./scripts/buildNIM.sh -t YOUR_DOCKER_REGISTRY/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key
 ```
 
 NGINX Instance Manager and API Connectivity Manager
 
 ```
-./scripts/buildNIM.sh -t registry.ff.lan:31005/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -A
+./scripts/buildNIM.sh -t YOUR_DOCKER_REGISTRY/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -A
 ```
 
 NGINX Instance Manager, Security Monitoring and WAF Policy Compiler
 
 ```
-./scripts/buildNIM.sh -t registry.ff.lan:31005/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -W -P v4.2.0
+./scripts/buildNIM.sh -t YOUR_DOCKER_REGISTRY/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -W -P v4.457.0
 ```
 
 NGINX Instance Manager, API Connectivity Manager, WAF Policy Compiler and Security Monitoring
 
 ```
-./scripts/buildNIM.sh -t registry.ff.lan:31005/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -A -W -P v4.2.0
-```
-
-NGINX Instance Manager, API Connectivity Manager, WAF Policy Compiler, Security Monitoring and App Delivery Manager
-
-```
-./scripts/buildNIM.sh -t registry.ff.lan:31005/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -A -W -P v4.2.0 -D
+./scripts/buildNIM.sh -t YOUR_DOCKER_REGISTRY/nginx-nim2:automated -i -C certs/nginx-repo.crt -K certs/nginx-repo.key -A -W -P v4.457.0
 ```
 
 ### Manual build

nginx-nms-docker/container/startNIM.sh

@@ -132,14 +132,6 @@ then
 	su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-acm server &' -s /bin/bash
 fi
 
-# Start App Delivery Manager
-if [ -f /usr/bin/nms-adm ]
-then
-	/bin/bash -c '`which mkdir` -p /var/run/nms/modules/adm'
-	/bin/bash -c '`which chown` -R nms:nms /var/run/nms/modules/adm'
-	su - nms -c 'function repeat { while [ 1 ] ; do "$@" ; sleep 1 ; done; };repeat /usr/bin/nms-adm server &' -s /bin/bash
-fi
-
 sleep 5
 
 # Start Security Monitoring

nginx-nms-docker/scripts/buildNIM.sh

@@ -19,8 +19,7 @@ Automated build:\n\n
 -K [file.key]\t\t- Key file to pull packages from the official NGINX repository\n
 -A\t\t\t- Enable API Connectivity Manager - optional\n
 -W\t\t\t- Enable Security Monitoring - optional\n
--P [version]\t\t- Enable WAF policy compiler, version can be any [v3.1088.2|v4.100.1|v4.2.0|v4.218.0|v4.279.0|v4.402.0|v4.457.0] - optional\n
--D\t\t\t- Enable App Delivery Manager - optional\n\n
+-P [version]\t\t- Enable WAF policy compiler, version can be any [v3.1088.2|v4.100.1|v4.2.0|v4.218.0|v4.279.0|v4.402.0|v4.457.0|v4.583.0] - optional\n\n
 === Examples:\n\n
 Manual build:\n
 \t$0 -n nim-files/nms-instance-manager_2.6.0-698150575~focal_amd64.deb \\\\\n
@@ -30,13 +29,13 @@ Manual build:\n
 \t\t-t my.registry.tld/nginx-nms:2.6.0\n\n
 Automated build:\n
 \t$0 -i -C nginx-repo.crt -K nginx-repo.key\n
-\t\t-A -W -P v4.457.0 -D -t my.registry.tld/nginx-nms:2.13.1\n
+\t\t-A -W -P v4.583.0 -t my.registry.tld/nginx-nms:latest\n
 "
 
 # Defaults
 COUNTER=false
 
-while getopts 'hn:a:w:p:t:siC:K:AWP:D' OPTION
+while getopts 'hn:a:w:p:t:siC:K:AWP:' OPTION
 do
 	case "$OPTION" in
 		h)
@@ -79,9 +78,6 @@ do
                 P)
                         ADD_PUM=$OPTARG
                 ;;
-		D)
-			ADD_ADM=true
-		;;
 	esac
 done
 
@@ -117,7 +113,7 @@ then
                 --build-arg ACM_IMAGE=$ACM_IMAGE --build-arg SM_IMAGE=$SM_IMAGE --build-arg PUM_IMAGE=$PUM_IMAGE -t $IMGNAME .
 else
 	DOCKER_BUILDKIT=1 docker build --no-cache -f Dockerfile.automated --secret id=nginx-key,src=$NGINX_KEY --secret id=nginx-crt,src=$NGINX_CERT \
-                --build-arg ADD_ACM=$ADD_ACM --build-arg ADD_SM=$ADD_SM --build-arg ADD_PUM=$ADD_PUM --build-arg ADD_ADM=$ADD_ADM \
+                --build-arg ADD_ACM=$ADD_ACM --build-arg ADD_SM=$ADD_SM --build-arg ADD_PUM=$ADD_PUM \
 		--build-arg BUILD_WITH_SECONDSIGHT=$COUNTER \
                 -t $IMGNAME .
 fi