Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change all upstream-objects to upstream-object #3895

Merged
merged 2 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ce_0.13.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
url: /admin-api/#delete-sni

- text: Upstream Object routes
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
items:
- text: Add Upstream
url: /admin-api/#add-upstream
Expand Down
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ce_0.14.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
url: /admin-api/#delete-sni

- text: Upstream Object routes
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
items:
- text: Add Upstream
url: /admin-api/#add-upstream
Expand Down
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ce_1.0.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
url: /admin-api/#delete-sni

- text: Upstream Object routes
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
items:
- text: Add Upstream
url: /admin-api/#add-upstream
Expand Down
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ce_1.1.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
url: /admin-api/#delete-sni

- text: Upstream Object routes
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
items:
- text: Add Upstream
url: /admin-api/#add-upstream
Expand Down
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ee_0.34-x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
- text: SNI Object
url: /admin-api/#sni-objects
- text: Upstream Object
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
- text: Target Object
url: /admin-api/#target-object

Expand Down
2 changes: 1 addition & 1 deletion app/_data/docs_nav_ee_0.35-x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
- text: SNI Object routes
url: /admin-api/#sni-objects
- text: Upstream Object routes
url: /admin-api/#upstream-objects
url: /admin-api/#upstream-object
- text: Target Object routes
url: /admin-api/#target-object
- text: Workspace Object routes
Expand Down
4 changes: 2 additions & 2 deletions app/enterprise/0.34-x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ unhealthy status to a non-zero interval.
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -291,6 +291,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/0.35-x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/0.36-x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ unhealthy status to a non-zero interval.
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/1.3-x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -359,6 +359,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/1.5.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -358,6 +358,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/2.1.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -356,6 +356,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/2.2.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -356,6 +356,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/2.3.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -356,6 +356,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/2.4.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -356,6 +356,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/enterprise/2.5.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -356,6 +356,6 @@ upstreams.
[targetobject]: /enterprise/{{page.kong_version}}/admin-api#target-object
[addupstream]: /enterprise/{{page.kong_version}}/admin-api#add-upstream
[clustering]: /enterprise/{{page.kong_version}}/clustering
[upstreamobjects]: /enterprise/{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /enterprise/{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /enterprise/{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /enterprise/{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/0.13.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -291,6 +291,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/0.14.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -299,6 +299,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/1.0.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/1.1.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/1.2.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/1.3.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
4 changes: 2 additions & 2 deletions app/gateway-oss/1.4.x/health-checks-circuit-breakers.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ active health checks on `healthy` status to zero, and active checks on
### Enabling active health checks

To enable active health checks, you need to specify the configuration items
under `healthchecks.active` in the [Upstream object][upstreamobjects] configuration. You
under `healthchecks.active` in the [Upstream object][upstreamobject] configuration. You
need to specify the necessary information so that Kong can perform periodic
probing on the target, and how to interpret the resulting information.

Expand Down Expand Up @@ -318,6 +318,6 @@ upstreams.
[targetobject]: /{{page.kong_version}}/admin-api#target-object
[addupstream]: /{{page.kong_version}}/admin-api#add-upstream
[clustering]: /{{page.kong_version}}/clustering
[upstreamobjects]: /{{page.kong_version}}/admin-api#upstream-objects
[upstreamobject]: /{{page.kong_version}}/admin-api#upstream-object
[balancercaveats]: /{{page.kong_version}}/loadbalancing#balancing-caveats
[dnscaveats]: /{{page.kong_version}}/loadbalancing#dns-caveats
Loading