Merge branch 'main' into drop-support-for-old-systems

nginx · Aug 29, 2023 · 0d31264 · 0d31264
2 parents e9af155 + 181b995
commit 0d31264
Show file tree

Hide file tree

Showing 41 changed files with 789 additions and 617 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,6 +100,8 @@ jobs:
           version: "3.16"
         - image: "alpine"
           version: "3.17"
+        - image: "debian"
+          version: "bookworm-slim"
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3

diff --git a/Makefile b/Makefile
@@ -5,24 +5,24 @@ VERSION = $(shell git describe --match "v[0-9]*" --abbrev=0 --tags)
 COMMIT = $(shell git rev-parse --short HEAD)
 DATE = $(shell date +%F_%H-%M-%S)
 
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# https://docs.nginx.com/nginx/releases/                                                                              #
-# These images are based on https://github.com/nginxinc/docker-nginx and are NOT recommended for production           #
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# | OS_RELEASE       | OS_VERSION                    | NOTES                                                          |
-# | ---------------- | ----------------------------- | -------------------------------------------------------------- |
-# | amazonlinux      | 2, 2023                       |                                                                |
-# | ubuntu           | 20.04, 22.04                  |                                                                |
-# | debian           | bullseye-slim, buster-slim    |                                                                |
-# | centos           | 7                             |                                                                |
-# | redhatenterprise | 7, 8, 9                       |                                                                |
-# | rockylinux       | 8, 9                          |                                                                |
-# | almalinux        | 8, 9                          |                                                                |
-# | alpine           | 3.15, 3.16, 3.17              |                                                                |
-# | oraclelinux      | 7, 8, 9                       |                                                                |
-# | suse             | sles12sp5, sle15              |                                                                |
-# | freebsd          |                               | Not supported                                                  |
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# https://docs.nginx.com/nginx/releases/                                                                                          #
+# These images are based on https://github.com/nginxinc/docker-nginx and are NOT recommended for production                       #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+# | OS_RELEASE       | OS_VERSION                                | NOTES                                                          |
+# | ---------------- | ----------------------------------------- | -------------------------------------------------------------- |
+# | amazonlinux      | 2, 2023                                   |                                                                |
+# | ubuntu           | 20.04, 22.04                              |                                                                |
+# | debian           | bookworm-slim, bullseye-slim, buster-slim |                                                                |
+# | centos           | 7                                         |                                                                |
+# | redhatenterprise | 7, 8, 9                                   |                                                                |
+# | rockylinux       | 8, 9                                      |                                                                |
+# | almalinux        | 8, 9                                      |                                                                |
+# | alpine           | 3.15, 3.16, 3.17                          |                                                                |
+# | oraclelinux      | 7, 8, 9                                   |                                                                |
+# | suse             | sles12sp5, sle15                          |                                                                |
+# | freebsd          |                                           | Not supported                                                  |
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 OS_RELEASE  ?= ubuntu
 OS_VERSION  ?= 22.04
 BASE_IMAGE  = "${CONTAINER_REGISTRY}/${OS_RELEASE}:${OS_VERSION}"

diff --git a/Makefile.packaging b/Makefile.packaging
@@ -8,7 +8,7 @@ GITHUB_PACKAGES_DIR := ./build/github/packages
 AZURE_PACKAGES_DIR := ./build/azure/packages
 GPG_PUBLIC_KEY      := .key
 
-DEB_DISTROS?=ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bullseye-11 debian-buster-10
+DEB_DISTROS?=ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 debian-buster-10
 DEB_ARCHS?=arm64 amd64
 RPM_DISTROS?=centos-7-x86_64 oraclelinux-7-x86_64 oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
 RPM_ARCH=x86_64

diff --git a/hugo/content/technical-specifications.md b/hugo/content/technical-specifications.md
@@ -34,6 +34,7 @@ CentOS
 
 Debian
 - 11 (x86_64, aarch64)
+- 12 (x86_64, aarch64)
 
 FreeBSD
 - 12.1+ (amd64)

diff --git a/main.go b/main.go
@@ -222,7 +222,7 @@ func loadPlugins(commander client.Commander, binary *core.NginxBinaryType, env *
 		}
 	}
 
-	if reporter != nil {
+	if loadedConfig.IsFeatureEnabled(agent_config.FeatureMetrics) || loadedConfig.IsFeatureEnabled(agent_config.FeatureMetricsSender) && reporter != nil {
 		corePlugins = append(corePlugins,
 			plugins.NewMetricsSender(reporter),
 		)
@@ -239,11 +239,12 @@ func loadPlugins(commander client.Commander, binary *core.NginxBinaryType, env *
 		corePlugins = append(corePlugins, plugins.NewOneTimeRegistration(loadedConfig, binary, env, sdkGRPC.NewMessageMeta(uuid.NewString()), version))
 	}
 
-	if loadedConfig.IsFeatureEnabled(agent_config.FeatureMetrics) || (len(loadedConfig.Nginx.NginxCountingSocket) > 0 && loadedConfig.IsFeatureEnabled(agent_config.FeatureNginxCounting)) {
+	if loadedConfig.IsFeatureEnabled(agent_config.FeatureMetrics) || loadedConfig.IsFeatureEnabled(agent_config.FeatureMetricsCollection) ||
+		(len(loadedConfig.Nginx.NginxCountingSocket) > 0 && loadedConfig.IsFeatureEnabled(agent_config.FeatureNginxCounting)) {
 		corePlugins = append(corePlugins, plugins.NewMetrics(loadedConfig, env, binary))
 	}
 
-	if loadedConfig.IsFeatureEnabled(agent_config.FeatureMetricsThrottle) {
+	if loadedConfig.IsFeatureEnabled(agent_config.FeatureMetrics) || loadedConfig.IsFeatureEnabled(agent_config.FeatureMetricsThrottle) {
 		corePlugins = append(corePlugins, plugins.NewMetricsThrottle(loadedConfig, env))
 	}
 

diff --git a/scripts/docker/nginx-oss/deb/Dockerfile b/scripts/docker/nginx-oss/deb/Dockerfile
@@ -21,6 +21,7 @@ RUN set -x \
                                                                         make \
                                                                         curl \
                                                                         lsb-release \
+                                                                        procps \
                                                                         nginx
 
 # Setup nginx agent repository

diff --git a/scripts/selinux/nginx_agent.pp b/scripts/selinux/nginx_agent.pp