Skip to content

Commit

Permalink
Merge branch 'main' into add-api-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
dhurley committed Jan 16, 2023
2 parents c43573a + b9f6ad7 commit dd93bb2
Show file tree
Hide file tree
Showing 346 changed files with 1,932 additions and 351 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ jobs:
with:
version: "${{ env.GOLANGCI_LINT_VERSION }}"
args: -c ./scripts/.golangci.yml
skip-pkg-cache: true
- name: Lint SDK Code
uses: golangci/golangci-lint-action@v3
with:
version: "${{ env.GOLANGCI_LINT_VERSION }}"
working-directory: sdk
args: -c ../scripts/.golangci.yml
skip-pkg-cache: true

unit-test:
name: Unit Tests
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ require (
github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000
github.com/prometheus/client_golang v1.13.0
github.com/rs/cors v1.8.2
gopkg.in/yaml.v2 v2.4.0
)

require (
Expand Down Expand Up @@ -81,7 +82,6 @@ require (
google.golang.org/genproto v0.0.0-20220805133916-01dd62135a58 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace github.com/nginx/agent/sdk/v2 => ./sdk
File renamed without changes.
6 changes: 2 additions & 4 deletions docs/README.md → hugo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ This folder houses the product documentation for the NGINX Agent:
Directory Tree:

```shell
└──docs
└── content
├──
└──
└──hugo
└──content
```

## Where to Find Docs Online
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/content/overview.md → hugo/content/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ NGINX Agent is a companion daemon for your NGINX Open Source or NGINX Plus insta
- Notifications of NGINX events


{{< img src="docs/grafana-dashboard-example.png" caption="Grafana dashboard showing metrics reported by NGINX Agent" alt="Grafana dashboard showing metrics reported by NGINX Agent" width="99%">}}
{{< img src="grafana-dashboard-example.png" caption="Grafana dashboard showing metrics reported by NGINX Agent" alt="Grafana dashboard showing metrics reported by NGINX Agent" width="99%">}}

## How it Works

NGINX Agent runs as a companion process on a system running NGINX. It provides gRPC and REST interfaces for configuration management and metrics collection from the NGINX process and operating system. NGINX Agent enables remote interaction with NGINX using common Linux tools and unlocks the ability to build sophisticated monitoring and control systems that can manage large collections of NGINX instances.

{{< img src="docs/agent-flow.png" caption="How Agent works" alt="How NGINX Agent works" width="99%">}}
{{< img src="agent-flow.png" caption="How Agent works" alt="How NGINX Agent works" width="99%">}}


## Configuration Management
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/go.mod → hugo/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nginx/agent/docs
module github.com/nginx/agent/hugo

go 1.18

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit dd93bb2

Please sign in to comment.