Skip to content

Commit b85e243

Browse files
authored
Merge pull request #220 from open-horizon/sync-docs-130
Issue-130: Align OH / IEAM docs
2 parents 968c73e + 69afef6 commit b85e243

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+496
-337
lines changed

docs/SUMMARY.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Summary
22

3-
* [{{site.data.keyword.edge}} 4.2](kc_welcome_containers.html)
3+
* [{{site.data.keyword.edge}} {{site.data.keywork.version}}](kc_welcome_containers.html)
44
* [Release notes](getting_started/release_notes.md)
55
* [What's new](getting_started/whats_new.md)
66
* [Known issues and limitations](getting_started/known_issues.md)
@@ -9,16 +9,19 @@
99
* [Supported languages](getting_started/languages.md)
1010
* [Conventions used in this document](getting_started/document_conventions.md)
1111
* [Overview of {{site.data.keyword.ieam}}](getting_started/overview_ieam.md)
12+
* [Overview of Secrets Manager](getting_started/overview_sm.md)
1213
* [Further reading](hub/overview.md)
1314
* [Installing the management hub](hub/hub.md)
1415
* [Passport Advantage](hub/part_numbers.md)
1516
* [Sizing and system requirements](hub/cluster_sizing.md)
1617
* [Configuration](hub/configuration.md)
1718
* [Installation](hub/installation.md)
1819
* [Install {{site.data.keyword.ieam}}](hub/online_installation.md)
20+
* [Installing {{site.data.keyword.ieam}} in an air gap environment](installing/airgap_install.md)
1921
* [Post installation](hub/post_install.md)
2022
* [Gather edge node files](hub/gather_files.md)
21-
* [Prepare for setting up edge nodes](hub/prepare_for_edge_nodes.md)
23+
* [Creating your API key](hub/prepare_for_edge_nodes.md)
24+
* [Upgrade](hub/upgrade.md)
2225
* [Uninstall](hub/uninstalling_hub.md)
2326
* [Installing edge nodes](installing/installing_edge_nodes.md)
2427
* [Edge devices](installing/edge_devices.md)
@@ -57,6 +60,7 @@
5760
* [Model management details](developing/model_management_details.md)
5861
* [Container deployment options](developing/container_deployment_options.md)
5962
* [CI-CD process for Edge services](developing/cicd_process.md)
63+
* [Secrets Manager details](developing/secrets_details.md)
6064
* [Developing an edge service for clusters](developing/developing_clusters.md)
6165
* [Developing a Kubernetes operator](developing/service_operators.md)
6266
* [Creating your own hello world for clusters](developing/creating_hello_world.md)
@@ -80,7 +84,7 @@
8084
* [GDPR considerations](user_management/gdpr.md)
8185
* [Using the management console](console/accessing_ui.md)
8286
* [Supported browsers](console/browsers.md)
83-
* [Exploring the console](console/exploring_console.md)
87+
* [Exploring the console](console/exploring_console.md)
8488
* [Using the CLI](cli/using_cli.md)
8589
* [Installing the hzn CLI](cli/hzn_cli.md)
8690
* [Exploring the hzn CLI](cli/exploring_hzn.md)
@@ -91,6 +95,7 @@
9195
* [Exchange API](api/exchange_swagger.json)
9296
* [MMS API](api/mms_swagger.json)
9397
* [SDO API](api/sdo_swagger.json)
98+
* [Agbot secure API](api/agbot_secure_api.json)
9499
<!--* [Integration with other products](developing/integration.md) Q3-->
95100
* [Troubleshooting tips and frequently asked questions](troubleshoot/troubleshooting.md)
96101
* [Troubleshooting tips](troubleshoot/troubleshooting_devices.md)

docs/admin/accessing_logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22

33
copyright:
4-
years: 2020
5-
lastupdated: "2020-04-7"
4+
years: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: Accessing logs
77
description: Accessing management hub logs.
88
---

docs/admin/backup_recovery.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22

33
copyright:
4-
years: 2020
5-
lastupdated: "2020-10-28"
4+
years: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: Backup
77
description: Data Backup and recovery
88
---
@@ -20,6 +20,10 @@ description: Data Backup and recovery
2020

2121
## {{site.data.keyword.open_shift_cp}} backup and recovery
2222

23+
For more information about cluster-wide data backup and recovery, see:
24+
25+
* [{{site.data.keyword.open_shift_cp}} 4.6 backup etcd](https://docs.openshift.com/container-platform/4.6/backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.html).
26+
2327
If you have not downloaded the {{site.data.keyword.semver}} bundle, use the following commands with your [Entitled Registry Key](https://myibm.ibm.com/products-services/containerlibrary):
2428

2529
```
@@ -77,7 +81,7 @@ If you are using your own remote databases, ensure that those databases are back
7781
ibm-eam-{{site.data.keyword.semver}}-bundle/tools/ieam-backup.sh -h
7882
```
7983
{: codeblock}
80-
84+
8185
**Note**: The backup script automatically detects the type of databases that are used during installation.
8286

8387
* If you run the following example with no options, it generates a folder where the script ran. The folder follows this naming pattern **ibm-edge-backup/$DATE/**:
@@ -86,7 +90,7 @@ If you are using your own remote databases, ensure that those databases are back
8690
ibm-eam-{{site.data.keyword.semver}}-bundle/tools/ieam-backup.sh
8791
```
8892
{: codeblock}
89-
93+
9094
If a **local database** installation was detected, your backup contains a **customresource** directory, a **databaseresources** directory, and two yaml files:
9195
9296
```
@@ -97,9 +101,9 @@ If you are using your own remote databases, ensure that those databases are back
97101
-rw-r--r-- 1 staff staff 3689 Oct 26 21:51 ibm-edge-config.yaml
98102
```
99103
{: codeblock}
100-
104+
101105
If a **remote database** installation was detected, you see the same directories that are listed previously, but three yaml files instead of 2.
102-
106+
103107
```
104108
$ ls -l ibm-edge-backup/20201026_215518/
105109
drwxr-xr-x 3 staff staff 96 Oct 26 21:55 customresource
@@ -118,14 +122,14 @@ To restore backups, an identical {{site.data.keyword.mgmt_hub}} must be installe
118122
119123
This situation occurs when the edge node recognizes that it no longer exists in the exchange because the database is now empty. Enable **ieam\_maintenance\_mode** to avoid this by starting the database resources only for the {{site.data.keyword.mgmt_hub}}. This allows restoration to complete before the remaining {{site.data.keyword.mgmt_hub}} resources (which use those databases) are started.
120124
121-
**Notes**:
125+
**Notes**:
122126
123127
* Restore backups to the same {{site.data.keyword.ieam}} version where the backup was taken; for example, a 4.2 {{site.data.keyword.ieam}} backup can only be restored to a 4.2 {{site.data.keyword.ieam}} installation.
124128
125129
* When your **Custom Resource** file was backed up, it was automatically modified to enter **ieam\_maintenance\_mode** immediately upon reapplication to the cluster.
126130
127131
* The restore scripts examine the **\[path/to/backup\]/customresource/eamhub-cr.yaml** file to determine what type of database was used previously.
128-
132+
129133
130134
1. As a cluster administrator, ensure that you are connected to your cluster with **cloudctl login** or **oc login** and that a valid backup was created. On the cluster where the backup was made, run the following command to delete the **eamhub** custom resource (this assumes the default name of **ibm-edge** was used for the custom resource):
131135
```
@@ -164,7 +168,7 @@ This situation occurs when the edge node recognizes that it no longer exists in
164168
{: codeblock}
165169
166170
Wait until all the database, SDO, and vault pods are running before proceeding. It is possible that vault may continually restart, the vault bootstrap may reach an `Error` state, and/or SDO will likely be in a `0/1 Running` state and may reach a `CrashLoopBackOff` state. These are expected, and it is ok to proceed with those pods in those states.
167-
171+
168172
6. Scale down the **eamhub** operator deployment to pause the operator and end the current control loop:
169173
```
170174
oc scale deploy ibm-eamhub-controller-manager --replicas=0
@@ -176,7 +180,7 @@ This situation occurs when the edge node recognizes that it no longer exists in
176180
ibm-eam-{{site.data.keyword.semver}}-bundle/tools/ieam-restore-data.sh -f ibm-edge-backup/20201026_215738/
177181
```
178182
{: codeblock}
179-
183+
180184
8. After the script completes and your data has been restored, scale the operator back up to restart the control loop:
181185
```
182186
oc scale deploy ibm-eamhub-controller-manager --replicas=1

docs/admin/multi_tenancy.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22

33
copyright:
4-
years: 2021
5-
lastupdated: "2021-02-20"
4+
years: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: Multitenacy
77
description: Software architecture in which a single instance of software runs on server and server multiplies tenants.
88

@@ -28,10 +28,10 @@ description: Software architecture in which a single instance of software runs o
2828

2929
Two broad use cases are used to leverage multi-tenancy in {{site.data.keyword.ieam}}:
3030

31-
* An enterprise has multiple business units, where each business unit is a separate organization in the same {{site.data.keyword.ieam}} management hub. Consider the legal, business, or technical reasons why each business unit ought to be a separate organization with its own set of {{site.data.keyword.ieam}} resources which are by default not accessible by the other business units. Note that even with separate organizations, the enterprise still has the option to use a common group of organization administrators to manage all of the organizations.
32-
* An enterprise hosts {{site.data.keyword.ieam}} as a service for its customers, where each of their customers has one or more organizations in the management hub. In this case, the organization administrators are unique to each customer.
31+
* An enterprise has multiple business units, where each business unit is a separate organization in the same {{site.data.keyword.ieam}} management hub. Consider the legal, business, or technical reasons why each business unit ought to be a separate organization with its own set of {{site.data.keyword.ieam}} resources, which are by default not accessible by the other business units. Even with separate organizations, the enterprise has the option to use a common group of organization administrators to manage all of the organizations.
32+
* An enterprise hosts {{site.data.keyword.ieam}} as a service for its clients, where each of their clients has one or more organizations in the management hub. In this case, the organization administrators are unique to each client.
3333

34-
The use case you choose determines how you configure {{site.data.keyword.ieam}} and Identity and Access Manager ([IAM](https://www.ibm.com/support/knowledgecenter/SSHKN6/iam/landing_iam.html)).
34+
The use case that you choose determines how you configure {{site.data.keyword.ieam}} and Identity and Access Manager ([IAM](https://www.ibm.com/support/knowledgecenter/SSHKN6/iam/landing_iam.html)).
3535

3636
### Types of {{site.data.keyword.ieam}} users
3737
{: #user-types}
@@ -52,9 +52,9 @@ See [Role-based access control](../user_management/rbac.md) for a description of
5252

5353
The IAM (Identity and Access Manager) service manages users for all Cloud Pak based products, including {{site.data.keyword.ieam}}. IAM in turn uses LDAP to store the users. Each IAM user can be a member of one or more IAM teams. Because each IAM team is associated with an IAM account, an IAM user can indirectly be a member of one or more IAM accounts. See [IAM multi-tenancy](https://www.ibm.com/support/knowledgecenter/SSHKN6/iam/3.x.x/multitenancy/multitenancy.html) for details.
5454

55-
The {{site.data.keyword.ieam}} exchange provides authentication and authorization services for the other {{site.data.keyword.ieam}} components. The exchange delegates the authentication of users to IAM, which means IAM user credentials are passed to the exchange and it relies on IAM to determine if they are valid. Each user role (hub admin, organization admin, or regular user) is defined in the exchange, and that determines the actions that users are allowed to perform in {{site.data.keyword.ieam}}.
55+
The {{site.data.keyword.ieam}} exchange provides authentication and authorization services for the other {{site.data.keyword.ieam}} components. The exchange delegates the authentication of users to IAM, which means IAM user credentials are passed to the exchange and it relies on IAM to determine whether they are valid. Each user role (hub admin, organization admin, or regular user) is defined in the exchange, and that determines the actions that users are allowed to perform in {{site.data.keyword.ieam}}.
5656

57-
Each organization in the {{site.data.keyword.ieam}} exchange is associated with an IAM account. Therefore IAM users in an IAM account are automatically members of the corresponding {{site.data.keyword.ieam}} organization. The one exception to this rule is that the {{site.data.keyword.ieam}} hub admin role is considered to be outside of any specific organization; therefore, it does not matter what IAM account the hub admin IAM user is in.
57+
Each organization in the {{site.data.keyword.ieam}} exchange is associated with an IAM account. Therefore, IAM users in an IAM account are automatically members of the corresponding {{site.data.keyword.ieam}} organization. The one exception to this rule is that the {{site.data.keyword.ieam}} hub admin role is considered to be outside of any specific organization; therefore, it does not matter what IAM account the hub admin IAM user is in.
5858

5959
To summarize the mapping between IAM and {{site.data.keyword.ieam}}:
6060

@@ -77,7 +77,7 @@ By default, an organization was created during {{site.data.keyword.ieam}} instal
7777

7878
The IBM organization is a unique organization that provides predefined services and patterns that are intended to be technology examples that are usable by any user in any organization. The IBM organization is automatically created when the {{site.data.keyword.ieam}} management hub is installed.
7979

80-
**Note:** Although the resources in the IBM organization are public, the IBM organization is not intended to hold all public content in the {{site.data.keyword.ieam}} management hub.
80+
**Note**: Although the resources in the IBM organization are public, the IBM organization is not intended to hold all public content in the {{site.data.keyword.ieam}} management hub.
8181

8282
## Organization Configuration
8383
{: #org-config}
@@ -89,7 +89,7 @@ Every {{site.data.keyword.ieam}} organization has the following settings. The de
8989
| `description` | A description of the organization. |
9090
| `label` | The name of the organization. This value is used to display the organization name in the {{site.data.keyword.ieam}} management console. |
9191
| `heartbeatIntervals` | How often edge node agents in the organization poll the management hub for instructions. See the following section for details. |
92-
| `limits` | Limits for this organization. Currently the only limit is `maxNodes`, which is the maximum number of edge nodes allowed in this organization. There is a practical limit to the total number of edge nodes that a single {{site.data.keyword.ieam}} management hub can support. This setting enables the hub admin user to limit the number of nodes that each organization can have, which prevents one organization from using all of the capacity. A value of `0` means no limit. |
92+
| `limits` | Limits for this organization. Currently, the only limit is `maxNodes`, which is the maximum number of edge nodes that are allowed in this organization. There is a practical limit to the total number of edge nodes that a single {{site.data.keyword.ieam}} management hub can support. This setting enables the hub admin user to limit the number of nodes that each organization can have, which prevents one organization from using all of the capacity. A value of `0` means no limit. |
9393
{: caption="Table 3. Organization settings" caption-side="top"}
9494

9595
### Agent heartbeat polling interval

docs/api/agent_api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22

33
copyright:
4-
years: 2021
5-
lastupdated: "2021-02-20"
4+
years: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: Agent API
7-
description: Agent APIs are REST APIs for the Horizon agent running on an edge node.
7+
description: Agent APIs are REST APIs for the {{site.data.keyword.horizon}} agent running on an edge node.
88
---
99

1010
{:new_window: target="blank"}

docs/cli/cloudctl_oc_cli.md

Lines changed: 47 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22

33
copyright:
4-
years: 2021
5-
lastupdated: "2021-02-20"
4+
years: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: "Installing cloudctl, kubectl, and oc"
77
description: ""
88
---
@@ -16,52 +16,65 @@ description: ""
1616
{:childlinks: .ullinks}
1717

1818
# Installing cloudctl, kubectl, and oc
19+
{: #cloudctl_oc_cli}
1920

20-
Follow these steps to install the command line tools that are needed to manage aspects of the IBM Edge Application Manager (IEAM) management hub and edge clusters:
21+
Follow these steps to install the command line tools that are needed to manage aspects of the {{site.data.keyword.edge_notm}} ({{site.data.keyword.ieam}}) management hub and edge clusters:
2122

22-
### cloudctl
23+
## cloudctl
2324

24-
1. Browse your IEAM web UI at: https://<CLUSTER_URL>/common-nav/cli
25-
2. Expand the __IBM Cloud Pak CLI__ section and select your __OS__.
26-
3. Copy the displayed __curl__ command and run it to download the __cloudctl__ binary.
27-
4. Make the file executable and move it to __/usr/local/bin__:
25+
1. Browse your {{site.data.keyword.ieam}} web UI at: `https://&lt;CLUSTER_URL&gt;/common-nav/cli`
2826

29-
```sh
30-
chmod 755 cloudctl-*
31-
sudo mv cloudctl-* /usr/local/bin/cloudctl
32-
```
33-
5. Ensure __/usr/local/bin__ is in your PATH and then verify that cloudctl is working:
27+
2. Expand the **IBM Cloud Pak CLI** section and select your **OS**.
3428

35-
```sh
36-
cloudctl --help
37-
```
29+
3. Copy the displayed **curl** command and run it to download the **cloudctl** binary.
3830

31+
4. Make the file executable and move it to **/usr/local/bin**:
32+
33+
```bash
34+
chmod 755 cloudctl-*
35+
sudo mv cloudctl-* /usr/local/bin/cloudctl
36+
```
37+
{: codeblock}
38+
39+
5. Ensure **/usr/local/bin** is in your PATH and then verify that **cloudctl** is working:
40+
41+
```bash
42+
cloudctl --help
43+
```
44+
{: codeblock}
45+
46+
## oc
3947

40-
### OC
48+
1. Download the {{site.data.keyword.open_shift_cp}} CLI tar file from [OpenShift client CLI (oc)](https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/). Select the file **openshift-client-\*-\*.tar.gz** for your operating system.
4149

42-
1. Download the OpenShift Container Platform CLI tar file from OpenShift client CLI (oc). Select the file __openshift-client-*-*.tar.gz__ for your operating system.
4350
2. Find the downloaded tar file and unpack it:
44-
45-
```sh
51+
52+
```bash
4653
tar -zxvf openshift-client-*-*.tar.gz
4754
```
48-
3. Move the oc command to __/usr/local/bin__:
49-
50-
```sh
55+
{: codeblock}
56+
57+
3. Move the **oc** command to **/usr/local/bin**:
58+
59+
```bash
5160
sudo mv oc /usr/local/bin/
5261
```
53-
4. Ensure /usr/local/bin is in your PATH and verify that oc is working:
54-
55-
```sh
56-
oc --help
57-
```
62+
{: codeblock}
5863

59-
Alternatively, use [homebrew](https://www.ibm.com/links?url=https%3A%2F%2Fbrew.sh%2F) to install __oc__ on macOS:
64+
4. Ensure **/usr/local/bin** is in your PATH and verify that **oc** is working:
65+
66+
```bash
67+
oc --help
68+
```
69+
{: codeblock}
6070

61-
```sh
62-
brew install openshift-cli
63-
```
71+
Alternatively, use [homebrew](https://brew.sh/) to install **oc** on {{site.data.keyword.macOS_notm}}:
72+
73+
```bash
74+
brew install openshift-cli
75+
```
76+
{: codeblock}
6477

65-
### Kubectl
78+
## Kubectl
6679

67-
Follow the instructions in [Install and Set Up kubectl](https://www.ibm.com/links?url=https%3A%2F%2Fkubernetes.io%2Fdocs%2Ftasks%2Ftools%2Finstall-kubectl%2F).
80+
Follow the instructions in [Install and Set Up kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/).

docs/cli/exploring_hzn.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22

33
copyright:
4-
years: 2021
5-
lastupdated: "2021-02-20"
4+
yyears: 2020 - 2022
5+
lastupdated: "2022-03-17"
66
title: hzn Command
77
description: ""
88
---
@@ -15,7 +15,7 @@ description: ""
1515
{:child: .link .ulchildlink}
1616
{:childlinks: .ullinks}
1717

18-
# Exploring the hzn command
18+
# Exploring the hzn CLI
1919
{: #exploring-hzn}
2020

2121
On {{site.data.keyword.horizon}} edge nodes, use the `hzn` command to inspect many aspects of the state of the local system and of the larger {{site.data.keyword.edge_notm}} ecosystem outside your edge node. Use the `hzn` command to interact with the system and change the state of resources you own.

0 commit comments

Comments
 (0)