merge main

Author: aphralG

.github/workflows/ci.yml

@@ -93,10 +93,12 @@ jobs:
     strategy:
       matrix:
         container:
+        - image: "ubuntu"
+          version: "24.04"
         - image: "redhatenterprise"
           version: "9"
         - image: "alpine"
-          version: "3.19"
+          version: "3.22"
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0

.github/workflows/scorecards.yml

@@ -37,7 +37,6 @@ jobs:
         with:
           results_file: results.sarif
           results_format: sarif
-          repo_token: ${{ secrets.SCORECARD_TOKEN }}
 
           # Publish the results for public repositories to enable scorecard badges. For more details, see
           # https://github.com/ossf/scorecard-action#publishing-results.

.github/workflows/upload-release-assets.yml

@@ -64,9 +64,23 @@ jobs:
           echo "${{secrets.PUBTEST_CERT}}" > pubtest.crt
           echo "${{secrets.PUBTEST_KEY}}" > pubtest.key
           PKG_REPO=${{inputs.pkgRepo}} CERT=pubtest.crt KEY=pubtest.key DL=1 scripts/packages/package-check.sh ${{inputs.pkgVersion}}
+          for i in $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"); do
+            if [[ "$i" == *.deb ]]; then
+              echo "Renaming ${i} to ${i/_/-}"
+              mv "${i}" "${i/_/-}"
+            fi 
+            if [[ "$i" == *.apk ]]; then
+              ver=$(echo "$i" | grep -o -e "v[0-9]*\.[0-9]*")
+              arch=$(echo "$i" | grep -o -F -e "x86_64" -e "aarch64")
+              dest="$(dirname "$i")/nginx-agent-${{inputs.pkgVersion}}-$ver-$arch.apk"
+              echo "Renaming ${i} to ${dest}"
+              mv "${i}" "${dest}"
+            fi
+          done
           find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"
 
       - name: GitHub Upload
+        continue-on-error: true
         if: ${{ needs.vars.outputs.github_release == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -88,11 +102,6 @@ jobs:
           inlineScript: |
             for i in $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"); do
               dest="nginx-agent/${GITHUB_REF##*/}/${i##*/}"
-              if [[ "$i" == *.apk ]]; then
-                ver=$(echo "$i" | grep -o -e "v[0-9]*\.[0-9]*")
-                arch=$(echo "$i" | grep -o -F -e "x86_64" -e "aarch64")
-                dest="nginx-agent/${GITHUB_REF##*/}/nginx-agent-$VER-$ver-$arch.apk"
-              fi
               echo "Uploading ${i} to ${dest}"
               az storage blob upload --auth-mode=login -f "$i" -c ${{ secrets.AZURE_CONTAINER_NAME }} \
               --account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n ${dest}

Makefile

@@ -22,12 +22,12 @@ GOBIN 	?= $$(go env GOPATH)/bin
 # | redhatenterprise | 8, 9                                  	 |                                                                |
 # | rockylinux       | 8, 9                                      |                                                                |
 # | almalinux        | 8, 9                                      |                                                                |
-# | alpine           | 3.17, 3.18, 3.19, 3.20, 3.21              |                                                                |
+# | alpine           | 3.18, 3.19, 3.20, 3.21 3.22               |                                                                |
 # | oraclelinux      | 8, 9                                		 |                                                                |
-# | suse             | sles12sp5, sle15                          |                                                                |
+# | suse             | sle15                          			 |                                                                |
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 OS_RELEASE  ?= ubuntu
-OS_VERSION  ?= 22.04
+OS_VERSION  ?= 24.04
 BASE_IMAGE  = "docker.io/$(OS_RELEASE):$(OS_VERSION)"
 IMAGE_TAG   = "agent_$(OS_RELEASE)_$(OS_VERSION)"
 DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
@@ -62,7 +62,7 @@ APK_PACKAGE := ./build/$(PACKAGE_NAME).apk
 DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
 RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm
 
-MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
+MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?= 
 MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
 MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
 MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0

Makefile.packaging

@@ -14,14 +14,14 @@ TARBALL_NAME        := $(PACKAGE_PREFIX).tar.gz
 
 DEB_DISTROS         ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11
 DEB_ARCHS           ?= arm64 amd64
-RPM_DISTROS         ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
+RPM_DISTROS         ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64
 RPM_ARCH            := x86_64
 REDHAT_VERSIONS     ?= redhatenterprise-8 redhatenterprise-9
 REDHAT_ARCHS        ?= aarch64 x86_64
 ROCKY_VERSIONS      ?= rocky-8 rocky-9
 ROCKY_ARCHS         ?= aarch64 x86_64
 FREEBSD_DISTROS     ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64" 
-APK_VERSIONS        ?= 3.18 3.19 3.20 3.21
+APK_VERSIONS        ?= 3.18 3.19 3.20 3.21 3.22
 APK_ARCHS           ?= aarch64 x86_64
 APK_REVISION 		?= 1
 ALMA_VERSIONS       ?= almalinux-8 almalinux-9

internal/collector/containermetricsreceiver/internal/utils.go

@@ -22,12 +22,20 @@ func ReadLines(filename string) ([]string, error) {
 }
 
 // nolint: revive
-func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
+func ReadLinesOffsetN(filename string, offset uint, n int) (lines []string, err error) {
 	f, err := os.Open(filename)
+	defer func() {
+		closeErr := f.Close()
+		if closeErr != nil {
+			if err == nil {
+				err = closeErr
+			}
+		}
+	}()
+
 	if err != nil {
 		return []string{}, err
 	}
-	defer f.Close()
 
 	var ret []string
 

internal/config/types.go

@@ -433,6 +433,10 @@ func (c *Config) AreReceiversConfigured() bool {
 }
 
 func isAllowedDir(dir string, allowedDirs []string) bool {
+	if !strings.HasSuffix(dir, "/") && filepath.Ext(dir) == "" {
+		dir += "/"
+	}
+
 	for _, allowedDirectory := range allowedDirs {
 		if strings.HasPrefix(dir, allowedDirectory) {
 			return true

internal/config/types_test.go

@@ -25,10 +25,10 @@ func TestTypes_IsDirectoryAllowed(t *testing.T) {
 			allowed: true,
 			allowedDirs: []string{
 				AgentDirName,
-				"/etc/nginx",
+				"/etc/nginx/",
 				"/var/log/nginx/",
 			},
-			fileDir: "/etc/nginx/nginx.conf",
+			fileDir: "/etc/nginx",
 		},
 		{
 			name:    "Test 2: directory not allowed",

internal/datasource/config/nginx_config_parser.go

@@ -100,7 +100,7 @@ func (ncp *NginxConfigParser) Parse(ctx context.Context, instance *mpi.Instance)
 	return ncp.createNginxConfigContext(ctx, instance, payload)
 }
 
-// nolint: cyclop,revive,gocognit
+// nolint: cyclop,revive,gocognit,gocyclo
 func (ncp *NginxConfigParser) createNginxConfigContext(
 	ctx context.Context,
 	instance *mpi.Instance,
@@ -138,6 +138,10 @@ func (ncp *NginxConfigParser) createNginxConfigContext(
 		err := ncp.crossplaneConfigTraverse(ctx, &conf,
 			func(ctx context.Context, parent, directive *crossplane.Directive) error {
 				switch directive.Directive {
+				case "include":
+					include := ncp.parseIncludeDirective(directive)
+
+					nginxConfigContext.Includes = append(nginxConfigContext.Includes, include)
 				case "log_format":
 					formatMap = ncp.formatMap(directive)
 				case "access_log":
@@ -214,6 +218,17 @@ func (ncp *NginxConfigParser) createNginxConfigContext(
 	return nginxConfigContext, nil
 }
 
+func (ncp *NginxConfigParser) parseIncludeDirective(directive *crossplane.Directive) string {
+	var include string
+	if filepath.IsAbs(directive.Args[0]) {
+		include = directive.Args[0]
+	} else {
+		include = filepath.Join(filepath.Dir(directive.File), directive.Args[0])
+	}
+
+	return include
+}
+
 func (ncp *NginxConfigParser) addAccessLog(accessLog *model.AccessLog,
 	accessLogs []*model.AccessLog,
 ) []*model.AccessLog {

internal/datasource/host/info.go

@@ -205,16 +205,17 @@ func (i *Info) containerID() string {
 // mountInfo is the path: "/proc/self/mountinfo"
 func containerIDFromMountInfo(mountInfo string) (string, error) {
 	mInfoFile, err := os.Open(mountInfo)
-	if err != nil {
-		return "", fmt.Errorf("could not read %s: %w", mountInfo, err)
-	}
 	defer func(f *os.File, fileName string) {
 		closeErr := f.Close()
 		if closeErr != nil {
 			slog.Error("Unable to close file", "file", fileName, "error", closeErr)
 		}
 	}(mInfoFile, mountInfo)
 
+	if err != nil {
+		return "", fmt.Errorf("could not read %s: %w", mountInfo, err)
+	}
+
 	fileScanner := bufio.NewScanner(mInfoFile)
 	fileScanner.Split(bufio.ScanLines)
 
@@ -308,15 +309,15 @@ func (i *Info) releaseInfo(ctx context.Context, osReleaseLocation string) (relea
 
 func readOsRelease(path string) (map[string]string, error) {
 	f, err := os.Open(path)
-	if err != nil {
-		return nil, fmt.Errorf("release file %s is unreadable: %w", path, err)
-	}
 	defer func(f *os.File, fileName string) {
 		closeErr := f.Close()
 		if closeErr != nil {
 			slog.Error("Unable to close file", "file", fileName, "error", closeErr)
 		}
 	}(f, path)
+	if err != nil {
+		return nil, fmt.Errorf("release file %s is unreadable: %w", path, err)
+	}
 
 	info, err := parseOsReleaseFile(f)
 	if err != nil {