diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html index 2e909e6bc..cdc2ba083 100644 --- a/app/docker/views/dashboard/dashboard.html +++ b/app/docker/views/dashboard/dashboard.html @@ -1,6 +1,6 @@ - Endpoint summary + Environment summary
@@ -34,12 +34,12 @@
- + - + - +
EndpointEnvironment {{ endpoint.Name }} diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html index d906d86c6..3ca6b421f 100644 --- a/app/docker/views/docker-features-configuration/docker-features-configuration.html +++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html @@ -14,7 +14,7 @@
- These features are only available for an Agent enabled endpoints. + These features are only available for an Agent enabled environments.
diff --git a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html index d19f4b8bc..f5da826c8 100644 --- a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html +++ b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.html @@ -52,7 +52,7 @@
Loading...
No endpoint available.No environment available.
diff --git a/app/edge/components/edge-job-form/edgeJobForm.html b/app/edge/components/edge-job-form/edgeJobForm.html index d94f24004..b3d75e3a2 100644 --- a/app/edge/components/edge-job-form/edgeJobForm.html +++ b/app/edge/components/edge-job-form/edgeJobForm.html @@ -75,7 +75,7 @@
- Time should be set according to the chosen endpoints' timezone. + Time should be set according to the chosen environments' timezone.
@@ -130,7 +130,7 @@ />
- Time should be set according to the chosen endpoints' timezone. + Time should be set according to the chosen environments' timezone.
@@ -215,7 +215,7 @@
- Target endpoints + Target environments
- Endpoint + Environment diff --git a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html index 69bb34b98..2cb16bc40 100644 --- a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html +++ b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html @@ -57,7 +57,7 @@ Loading... - No endpoint available. + No environment available. diff --git a/app/edge/components/edge-stack-status/edgeStackStatus.html b/app/edge/components/edge-stack-status/edgeStackStatus.html index 5ffda22b5..02c8a07d0 100644 --- a/app/edge/components/edge-stack-status/edgeStackStatus.html +++ b/app/edge/components/edge-stack-status/edgeStackStatus.html @@ -1,3 +1,3 @@ -{{ $ctrl.status.acknowledged || 0 }} -{{ $ctrl.status.ok || 0 }} -{{ $ctrl.status.error || 0 }} +{{ $ctrl.status.acknowledged || 0 }} +{{ $ctrl.status.ok || 0 }} +{{ $ctrl.status.error || 0 }} diff --git a/app/edge/components/group-form/groupForm.html b/app/edge/components/group-form/groupForm.html index 128b9e6e7..2d9c79dc4 100644 --- a/app/edge/components/group-form/groupForm.html +++ b/app/edge/components/group-form/groupForm.html @@ -30,7 +30,7 @@ Static
-

Manually select Edge endpoints

+

Manually select Edge environments

@@ -40,7 +40,7 @@ Dynamic
-

Automatically associate endpoints via tags

+

Automatically associate environments via tags

@@ -49,9 +49,9 @@
- +
- Associated endpoints + Associated environments
-
No Edge endpoints are available. Head over to the Endpoints view to add endpoints.
+
No Edge environments are available. Head over to the Environments view to add environments.
@@ -84,7 +84,7 @@ Partial match
-

Associate any endpoint matching at least one of the selected tags

+

Associate any environment matching at least one of the selected tags

@@ -94,7 +94,7 @@ Full match
-

Associate any endpoint matching all of the selected tags

+

Associate any environment matching all of the selected tags

@@ -106,7 +106,7 @@
- Associated endpoints by tags + Associated environments by tags
- Endpoints Count + Environments Count diff --git a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html index 74bab4ec9..d5d5c04b5 100644 --- a/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html +++ b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html @@ -26,11 +26,11 @@
- Endpoints + Environments

Server metrics features must be enabled in the - endpoint configuration view. + environment configuration view.

diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html index 9ea2f7cf5..4f9dc6d70 100644 --- a/app/kubernetes/views/configure/configure.html +++ b/app/kubernetes/views/configure/configure.html @@ -1,5 +1,5 @@ - Endpoints > {{ ctrl.endpoint.Name }} > Kubernetes configuration + Environment > {{ ctrl.endpoint.Name }} > Kubernetes configuration diff --git a/app/kubernetes/views/dashboard/dashboard.html b/app/kubernetes/views/dashboard/dashboard.html index e449d57f3..903c54075 100644 --- a/app/kubernetes/views/dashboard/dashboard.html +++ b/app/kubernetes/views/dashboard/dashboard.html @@ -1,5 +1,5 @@ - Endpoint summary + Environment summary @@ -8,12 +8,12 @@
- + - + diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html index 7a34c74c0..d6ba1d52b 100644 --- a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html +++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html @@ -38,8 +38,8 @@
- No user nor team access has been set on the endpoint. Head over to the - endpoint access view to manage them. + No user nor team access has been set on the environment. Head over to the + environment access view to manage them.
The ingress feature must be enabled in the - endpoint configuration view to be able to register ingresses inside this + environment configuration view to be able to register ingresses inside this namespace.
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html index 90b33db11..29d39b3a4 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePool.html +++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html @@ -165,7 +165,7 @@
The ingress feature must be enabled in the - endpoint configuration view to be able to register ingresses inside + environment configuration view to be able to register ingresses inside this namespace.
diff --git a/app/portainer/components/access-datatable/accessDatatable.html b/app/portainer/components/access-datatable/accessDatatable.html index 7dc4540d3..52c323103 100644 --- a/app/portainer/components/access-datatable/accessDatatable.html +++ b/app/portainer/components/access-datatable/accessDatatable.html @@ -3,7 +3,7 @@
- Access tagged as inherited are inherited from the group access. They cannot be removed or modified at the endpoint level but they can be overriden. + Access tagged as inherited are inherited from the group access. They cannot be removed or modified at the environment level but they can be overriden.
Access tagged as override are overriding the group access for the related users/teams.
diff --git a/app/portainer/components/accessControlPanel/porAccessControlPanel.html b/app/portainer/components/accessControlPanel/porAccessControlPanel.html index 40e6135f0..5fc0967b3 100644 --- a/app/portainer/components/accessControlPanel/porAccessControlPanel.html +++ b/app/portainer/components/accessControlPanel/porAccessControlPanel.html @@ -18,7 +18,7 @@ {{ $ctrl.resourceControl.Ownership }} @@ -145,7 +145,7 @@ Public
-

I want any user with access to this endpoint to be able to manage this resource

+

I want any user with access to this environment to be able to manage this resource

diff --git a/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html b/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html index 26136e419..5cd20d771 100644 --- a/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html +++ b/app/portainer/components/associated-endpoints-selector/associatedEndpointsSelector.html @@ -1,11 +1,11 @@
- You can select which endpoint should be part of this group by moving them to the associated endpoints table. Simply click on any endpoint entry to move it from one table to the + You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one table to the other.
-
Available endpoints
+
Available environments
-
Associated endpoints
+
Associated environments
 - +
EndpointEnvironment {{ ctrl.endpoint.Name }}
- Endpoint + Environment Role diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html index 415191f4b..54023c703 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html @@ -15,7 +15,7 @@ Remove
@@ -102,7 +102,7 @@
Loading...
No endpoint available.No environment available.
diff --git a/app/portainer/components/datatables/roles-datatable/rolesDatatable.html b/app/portainer/components/datatables/roles-datatable/rolesDatatable.html index 107e08fb6..9ea5b1500 100644 --- a/app/portainer/components/datatables/roles-datatable/rolesDatatable.html +++ b/app/portainer/components/datatables/roles-datatable/rolesDatatable.html @@ -22,20 +22,20 @@ - Endpoint administrator - Full control of all resources in an endpoint + Environment administrator + Full control of all resources in an environment Helpdesk - Read-only access of all resources in an endpoint + Read-only access of all resources in an environment Read-only user - Read-only access of assigned resources in an endpoint + Read-only access of assigned resources in an environment Standard user - Full control of assigned resources in an endpoint + Full control of assigned resources in an environment diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index 8d440d045..552b0ee23 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -180,7 +180,7 @@ tooltip-append-to-body="true" tooltip-placement="bottom" tooltip-class="portainer-tooltip" - uib-tooltip="This stack was created inside an endpoint that is no longer registered inside Portainer." + uib-tooltip="This stack was created inside an environment that is no longer registered inside Portainer." > Orphaned diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html index f24929b28..cd2b2a5a8 100644 --- a/app/portainer/components/endpoint-list/endpointList.html +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -49,7 +49,7 @@ Loading...
- No endpoint available. + No environment available.
diff --git a/app/portainer/components/endpoint-selector/endpointSelector.html b/app/portainer/components/endpoint-selector/endpointSelector.html index c3800195f..10b057c56 100644 --- a/app/portainer/components/endpoint-selector/endpointSelector.html +++ b/app/portainer/components/endpoint-selector/endpointSelector.html @@ -1,5 +1,5 @@ - + {{ $select.selected.Name }} diff --git a/app/portainer/components/endpointSecurity/porEndpointSecurity.html b/app/portainer/components/endpointSecurity/porEndpointSecurity.html index f9c7fee8f..c18c64fa1 100644 --- a/app/portainer/components/endpointSecurity/porEndpointSecurity.html +++ b/app/portainer/components/endpointSecurity/porEndpointSecurity.html @@ -4,7 +4,7 @@
diff --git a/app/portainer/components/forms/group-form/groupForm.html b/app/portainer/components/forms/group-form/groupForm.html index 6b0b81cb4..16de62842 100644 --- a/app/portainer/components/forms/group-form/groupForm.html +++ b/app/portainer/components/forms/group-form/groupForm.html @@ -36,20 +36,20 @@ > - +
- Associated endpoints + Associated environments
- You can select which endpoint should be part of this group by moving them to the associated endpoints table. Simply click on any endpoint entry to move it from one table to + You can select which environment should be part of this group by moving them to the associated environments table. Simply click on any environment entry to move it from one table to the other.
-
Available endpoints
+
Available environments
-
Associated endpoints
+
Associated environments
@@ -87,7 +87,7 @@
- Unassociated endpoints + Unassociated environments
diff --git a/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html b/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html index 1f3907ee4..30c499458 100644 --- a/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html +++ b/app/portainer/components/forms/stack-from-template-form/stackFromTemplateForm.html @@ -65,7 +65,7 @@
{{ $ctrl.state.formValidationError }}
This template type cannot be deployed on this endpoint.
This template type cannot be deployed on this environment.
diff --git a/app/portainer/components/information-panel-offline/informationPanelOffline.html b/app/portainer/components/information-panel-offline/informationPanelOffline.html index 17942ee5a..bcd5bfc51 100644 --- a/app/portainer/components/information-panel-offline/informationPanelOffline.html +++ b/app/portainer/components/information-panel-offline/informationPanelOffline.html @@ -2,7 +2,7 @@

- This endpoint is currently offline (read-only). Data shown is based on the latest available snapshot. + This environment is currently offline (read-only). Data shown is based on the latest available snapshot.

diff --git a/app/portainer/settings/general/ssl-certificate/ssl-certificate.html b/app/portainer/settings/general/ssl-certificate/ssl-certificate.html index 84c52b69d..222f62f4e 100644 --- a/app/portainer/settings/general/ssl-certificate/ssl-certificate.html +++ b/app/portainer/settings/general/ssl-certificate/ssl-certificate.html @@ -7,7 +7,7 @@

- Forcing HTTPs only will cause Portainer to stop listening on the HTTP port. Any edge agent endpoint that is using HTTP will no longer be available. + Forcing HTTPs only will cause Portainer to stop listening on the HTTP port. Any edge agent environment that is using HTTP will no longer be available.

diff --git a/app/portainer/views/endpoints/access/endpointAccess.html b/app/portainer/views/endpoints/access/endpointAccess.html index ea754aac7..f0c96ea86 100644 --- a/app/portainer/views/endpoints/access/endpointAccess.html +++ b/app/portainer/views/endpoints/access/endpointAccess.html @@ -1,14 +1,14 @@ - + - Endpoints > {{ ctrl.endpoint.Name }} > Access management + Environments > {{ ctrl.endpoint.Name }} > Access management
- + diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index 3827ff671..a3c32cab8 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -1,6 +1,6 @@ - - Endpoints > Add endpoint + + Environments > Add environment
@@ -130,8 +130,8 @@

- Allows you to create an endpoint that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All the - required information on how to connect an Edge agent to this endpoint will be available after endpoint creation. + Allows you to create an environment that can be registered with an Edge agent. The Edge agent will initiate the communications with the Portainer instance. All the + required information on how to connect an Edge agent to this environment will be available after environment creation.

You can read more about the Edge agent in the userguide available here.

@@ -257,7 +257,7 @@
@@ -350,7 +350,7 @@ Public IP @@ -487,8 +487,8 @@ analytics-event="portainer-endpoint-creation" analytics-properties="{ metadata: { type: 'docker-api' } }" > - Add endpoint - Creating endpoint... + Add environment + Creating environment...
diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html index 1078a01e2..aeb80bd9b 100644 --- a/app/portainer/views/endpoints/edit/endpoint.html +++ b/app/portainer/views/endpoints/edit/endpoint.html @@ -1,11 +1,11 @@ - + - Endpoints > {{ endpoint.Name }} + Environments > {{ endpoint.Name }} @@ -14,7 +14,7 @@

- This Edge endpoint is associated to an Edge environment {{ state.kubernetesEndpoint ? '(Kubernetes)' : '(Docker)' }}. + This Edge environment is associated to an Edge environment {{ state.kubernetesEndpoint ? '(Kubernetes)' : '(Docker)' }}.

Edge key: {{ endpoint.EdgeKey }} @@ -86,7 +86,7 @@

- For those prestaging the edge agent, use the following join token to associate the Edge agent with this endpoint. + For those prestaging the edge agent, use the following join token to associate the Edge agent with this environment.

You can read more about pre-staging in the userguide available here.

@@ -128,7 +128,7 @@
@@ -166,7 +166,7 @@ Poll frequency
@@ -220,8 +220,8 @@ ng-click="updateEndpoint()" button-spinner="state.actionInProgress" > - Update endpoint - Updating endpoint... + Update environment + Updating environment... Cancel
diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html index 7f1813ca7..657cceb86 100644 --- a/app/portainer/views/endpoints/endpoints.html +++ b/app/portainer/views/endpoints/endpoints.html @@ -1,16 +1,16 @@ - + - Endpoint management + Environment management
- + Groups > {{ group.Name }} > Access management diff --git a/app/portainer/views/groups/create/creategroup.html b/app/portainer/views/groups/create/creategroup.html index bddbfb650..f19069355 100644 --- a/app/portainer/views/groups/create/creategroup.html +++ b/app/portainer/views/groups/create/creategroup.html @@ -1,6 +1,6 @@ - - Endpoint groups > Add group + + Environment groups > Add group
diff --git a/app/portainer/views/groups/edit/group.html b/app/portainer/views/groups/edit/group.html index 0c0566486..ddbb927d1 100644 --- a/app/portainer/views/groups/edit/group.html +++ b/app/portainer/views/groups/edit/group.html @@ -1,5 +1,5 @@ - + Groups > {{ ::group.Name }} diff --git a/app/portainer/views/groups/groups.html b/app/portainer/views/groups/groups.html index 42e491286..714af8c68 100644 --- a/app/portainer/views/groups/groups.html +++ b/app/portainer/views/groups/groups.html @@ -1,14 +1,14 @@ - + - Endpoint group management + Environment group management
- +
diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index 3fc6bd415..3b1a4d47c 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -4,7 +4,7 @@ - Endpoints + Environments @@ -26,7 +26,7 @@ style="width: 100%; height: 100%; text-align: center; display: flex; flex-direction: column; align-items: center; justify-content: center;" ng-if="state.connectingToEdgeEndpoint" > - Connecting to the Edge endpoint... + Connecting to the Edge environment...
@@ -35,8 +35,8 @@

No environment available for management. Please head over the - endpoints view - to add an endpoint. + environments view + to add an environment.

@@ -44,7 +44,7 @@
- This will restore the Portainer metadata which contains information about the endpoints, stacks and applications, as well as the configured users. + This will restore the Portainer metadata which contains information about the environments, stacks and applications, as well as the configured users.
diff --git a/app/portainer/views/init/endpoint/initEndpoint.html b/app/portainer/views/init/endpoint/initEndpoint.html index 4d2686997..0db2685f9 100644 --- a/app/portainer/views/init/endpoint/initEndpoint.html +++ b/app/portainer/views/init/endpoint/initEndpoint.html @@ -8,10 +8,10 @@
- +
- +
@@ -22,7 +22,7 @@
- +
@@ -37,8 +37,8 @@
- - + +
@@ -48,7 +48,7 @@
- +
@@ -69,10 +69,10 @@
- +
- +
diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html index 742b3122f..3daf4862b 100644 --- a/app/portainer/views/registries/registries.html +++ b/app/portainer/views/registries/registries.html @@ -9,7 +9,7 @@ - View registries via an endpoint to manage access for user(s) and/or team(s) + View registries via an environment to manage access for user(s) and/or team(s) diff --git a/app/portainer/views/roles/roles.html b/app/portainer/views/roles/roles.html index a595909f1..9d73e610a 100644 --- a/app/portainer/views/roles/roles.html +++ b/app/portainer/views/roles/roles.html @@ -45,7 +45,7 @@
- Effective role for each endpoint will be displayed for the selected user + Effective role for each environment will be displayed for the selected user
diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html index de3bbe41e..8b2245b3f 100644 --- a/app/portainer/views/settings/settings.html +++ b/app/portainer/views/settings/settings.html @@ -94,7 +94,7 @@ Edge agent default poll frequency
diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 5a365f0d1..fe83ac39b 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -80,7 +80,7 @@
This stack was created outside of Portainer. Control over this stack is limited. - This stack is orphaned. You can reassociate it with the current environment using the "Associate to this endpoint" feature. + This stack is orphaned. You can reassociate it with the current environment using the "Associate to this environment" feature.

@@ -82,10 +82,10 @@
- Associate to this endpoint + Associate to this environment

- This feature allows you to reassociate this stack to the current endpoint. + This feature allows you to reassociate this stack to the current environment.

diff --git a/app/portainer/views/users/edit/user.html b/app/portainer/views/users/edit/user.html index f8b339336..1dbc16fcf 100644 --- a/app/portainer/views/users/edit/user.html +++ b/app/portainer/views/users/edit/user.html @@ -24,7 +24,7 @@ Administrator diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html index 7d888b46b..70ddb8ba4 100644 --- a/app/portainer/views/users/users.html +++ b/app/portainer/views/users/users.html @@ -75,7 +75,7 @@ Administrator @@ -112,8 +112,8 @@
- Note: non-administrator users who aren't in a team don't have access to any endpoints by default. Head over to the - Endpoints view to manage their accesses. + Note: non-administrator users who aren't in a team don't have access to any environments by default. Head over to the + Environments view to manage their accesses.