Merge remote-tracking branch 'origin/main' into update-unit-file

Author: CVanF5

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
   proxy-sanity-check:
     name: Proxy Sanity Check
     runs-on: ubuntu-22.04
-    if: ${{ !github.event.pull_request.head.repo.fork }}
+    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
     env:
       GOPROXY: "https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev"
     steps:
@@ -145,7 +145,7 @@ jobs:
   official-oss-image-integration-tests:
     name: Integration Tests - Official OSS Images
     needs: build-unsigned-snapshot
-    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref_name, 'dependabot/') }}
+    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -184,7 +184,7 @@ jobs:
   official-plus-image-integration-tests:
     name: Integration Tests - Official Plus Images
     needs: build-unsigned-snapshot
-    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref_name, 'dependabot/') }}
+    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -265,7 +265,7 @@ jobs:
         run: git push 'https://github-actions:${{ secrets.GITHUB_TOKEN }}@github.com/nginx/agent.git' benchmark-results:benchmark-results
   load-tests:
     name: Load Tests
-    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.ref_name, 'dependabot/') }}
+    if: ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
     permissions:
       contents: write
     runs-on: ubuntu-22.04

.github/workflows/mend.yml

@@ -25,7 +25,11 @@ permissions:
 
 jobs:
   mend:
-    if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) || (github.event_name == 'push' && github.event.repository.fork == false) }}
+    if: >-
+      ${{ 
+        (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-')) ||
+        (github.event_name == 'push' && !github.event.repository.fork)
+      }}
     uses: nginxinc/compliance-rules/.github/workflows/mend.yml@a27656f8f9a8748085b434ebe007f5b572709aad # v0.2
     secrets: inherit
     with:

.golangci.yml

@@ -39,7 +39,7 @@ linters:
     - nilnil
     - nlreturn
     - noctx
-#    - nolintlint
+    - nolintlint
     - nosprintfhostport
     - perfsprint
     - prealloc
@@ -66,7 +66,7 @@ linters:
     - zerologlint
   settings:
     cyclop:
-      max-complexity: 10
+      max-complexity: 12
       package-average: 0
     errorlint:
       errorf: true
@@ -216,19 +216,19 @@ linters:
         - chan
     nlreturn:
       block-size: 2
-#    nolintlint:
-#      # Disable to ensure that all nolint directives actually have an effect.
-#      # Default: false
-#      allow-unused: true
-#      # Exclude following linters from requiring an explanation.
-#      # Default: []
-#      allow-no-explanation: [ ]
-#      # Enable to require an explanation of nonzero length after each nolint directive.
-#      # Default: false
-#      require-explanation: true
-#      # Enable to require nolint directives to mention the specific linter being suppressed.
-#      # Default: false
-#      require-specific: true
+    nolintlint:
+      # Disable to ensure that all nolint directives actually have an effect.
+      # Default: false
+      allow-unused: true
+      # Exclude following linters from requiring an explanation.
+      # Default: []
+      allow-no-explanation: [ ]
+      # Enable to require an explanation of nonzero length after each nolint directive.
+      # Default: false
+      require-explanation: true
+      # Enable to require nolint directives to mention the specific linter being suppressed.
+      # Default: false
+      require-specific: true
     prealloc:
       simple: true
       range-loops: true
@@ -285,7 +285,7 @@ linters:
           disabled: false
         - name: cognitive-complexity
           arguments:
-            - 10
+            - 12
           severity: warning
           disabled: false
         - name: comment-spacings
@@ -310,7 +310,7 @@ linters:
           disabled: false
         - name: cyclomatic
           arguments:
-            - 10
+            - 12
           severity: warning
           disabled: false
         - name: datarace

Makefile

@@ -173,9 +173,8 @@ official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane
 	go test -v ./test/integration/managementplane ./test/integration/auxiliarycommandserver
 
 performance-test:
-	@mkdir -p $(TEST_BUILD_DIR)
-	@CGO_ENABLED=0 $(GOTEST) -count 10 -timeout 6m -bench=. -benchmem -run=^$$ ./... > $(TEST_BUILD_DIR)/benchmark.txt
-	@cat $(TEST_BUILD_DIR)/benchmark.txt
+	mkdir -p $(TEST_BUILD_DIR)
+	bash -c 'CGO_ENABLED=0 $(GOTEST) -count 10 -timeout 6m -bench=. -benchmem -run=^$$ ./... | tee $(TEST_BUILD_DIR)/benchmark.txt; test $${PIPESTATUS[0]} -eq 0'
 
 compare-performance-benchmark-results:
 	@$(GORUN) $(BENCHSTAT) $(OLD_BENCHMARK_RESULTS_FILE) $(TEST_BUILD_DIR)/benchmark.txt

README.md

@@ -1,131 +1,40 @@
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginx/agent)
+![GitHub Release](https://img.shields.io/github/v/release/nginx/agent)
 ![GitHub License](https://img.shields.io/github/license/nginx/agent)
 ![Contributions Welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)
-[![Slack](https://img.shields.io/badge/slack-join%20us-brightgreen.svg?logo=slack)](https://nginxcommunity.slack.com/channels/nginx-agent)
 ![coverage](https://raw.githubusercontent.com/nginx/agent/badges/.badges/v3/coverage.svg)
 
-# NGINX Agent
+# F5 NGINX Agent 
 
-NGINX Agent is a companion daemon for your NGINX Open Source or NGINX Plus instance. It enables:
+F5 NGINX Agent is a companion application designed to efficiently manage NGINX instances. Key features include: 
 
-- Remote management of NGINX configurations
-- Collection and reporting of real-time NGINX performance and operating system metrics
-- Notifications of NGINX events
+- Remote management: Easily control and configure NGINX instances remotely.  
+- Real-time metrics: Monitor and analyze performance data for NGINX and the underlying operating system.
 
-## Development Environment Setup
+Discover more advanced features and capabilities by visiting [Try NGINX One: Free Enterprise Trial](https://www.f5.com/trials/nginx-one). 
 
-### Installing Prerequisite Packages
 
-The following packages need to be installed:
+## Installation
 
-- make
-- golang (<https://go.dev/doc/install>)
-- protoc (<https://grpc.io/docs/protoc-installation/>)
-- mdatagen (There is currently an [issue installing mdatagen](https://github.com/open-telemetry/opentelemetry-collector/issues/9281). See instructions below for workaround.)
+You can install **NGINX Agent** using one of the following methods:
 
-#### Workaround to install mdatagen
+1. **Official documentation**  
+   Follow the step-by-step guide to add and configure instances:  
+   [How to add an instance](https://docs.nginx.com/nginx-one/how-to/nginx-configs/add-instance/)
 
-```console
-git clone https://github.com/open-telemetry/opentelemetry-collector.git
-cd opentelemetry-collector
-git checkout v0.124.0
-cd cmd/mdatagen
-go install
-```
+2. **GitHub releases**  
+   Download the latest binaries or packages directly from the GitHub releases page:  
+   [NGINX Agent GitHub releases](https://github.com/nginx/agent/releases)  
 
-Before starting development on the NGINX Agent, it is important to download and install the necessary tool and dependencies required by the NGINX Agent. You can do this by running the following `make` command:
+3. **Installation and upgrade guide**  
+   Access detailed instructions to install or upgrade NGINX Agent from the official NGINX documentation:  
+   [NGINX Agent Installation Guide](https://docs.nginx.com/nginx-agent/installation-upgrade/)
 
-```console
-make install-tools
-```
+## Useful links
 
-### Building NGINX Agent from Source Code
+* [v2 - Official NGINX Agent documentation](https://docs.nginx.com/nginx-agent/)
+* [v3 - Official NGINX Agent documentation](https://docs.nginx.com/nginx-one/agent/)
+* [F5 Support](https://my.f5.com/manage/s/)
 
-Build NGINX Agent deb package:
-
-```console
-OSARCH=<operating system archiecture> make local-deb-package
-```
-
-Build NGINX Agent rpm package:
-
-```console
-OSARCH=<operating system archiecture> make local-rpm-package
-```
-
-Build NGINX Agent apk package:
-
-```console
-OSARCH=<operating system archiecture> make local-apk-package
-```
-
-### Testing NGINX Agent
-
-#### Unit tests
-
-To run unit tests and check that there is enough test coverage run the following
-
-```console
-make unit-test coverge
-```
-
-To check for race conditions, the unit tests can also be run with a race condition detector
-
-```console
-make race-condition-test
-```
-
-#### Integration tests
-
-To run integration tests, run the following
-
-```console
-make integration-test
-```
-
-#### Testing with a mock management plane
-
-For testing command operations, there is a mock management gRPC server that can be used. See here: [mock management gRPC server](test/mock/grpc/README.md) \
-For testing metrics, there is a mock management OTel collector that can be used. See here: [mock management OTel collector](test/mock/collector/README.md)
-
-## NGINX Agent Technical Specifications
-
-### Supported Distributions
-
-NGINX Agent can run in most environments. For a list of supported distributions, see the [NGINX Technical Specs](https://docs.nginx.com/nginx/technical-specs/#supported-distributions) guide.
-
-### Supported Deployment Environments
-
-NGINX Agent can be deployed in the following environments:
-
-- Bare Metal
-- Container
-- Public Cloud: AWS, Google Cloud Platform, and Microsoft Azure
-- Virtual Machine
-
-### Supported NGINX Product Versions
-
-NGINX Agent works with all supported versions of NGINX Open Source and NGINX Plus.
-
-### Sizing Recommendations
-
-Minimum system sizing recommendations for NGINX Agent:
-TBD
-
-## Community
-
-- Our [NGINX Community Forum ](https://community.nginx.org/tag/agent) is the go-to place to ask questions and share your thoughts.
-
-- Our [GitHub issues page](https://github.com/nginx/agent/issues) offers space for a more technical discussion at your own pace.
-
-## Contributing
-
-Get involved with the project by contributing! Please see our [contributing guide](CONTRIBUTING.md) for details.
-
-## Change Log
-
-See our [release page](https://github.com/nginx/agent/releases) to keep track of updates.
-
-## License
-
-[Apache License, Version 2.0](LICENSE)
+## Community 
+If you have any questions please reach out using the [NGINX Community](https://community.nginx.org/)

api/grpc/mpi/v1/command.pb.go

@@ -120,6 +120,8 @@ message FileOverview {
     repeated File files = 1;
     // The configuration version of the current set of files
     ConfigVersion config_version = 2;
+    // The config file path of an instance
+    string config_path = 3;
 }
 
 // Represents meta data about a file