Skip to content

Commit

Permalink
add a new line before image
Browse files Browse the repository at this point in the history
  • Loading branch information
majguo committed Aug 31, 2020
1 parent e090ac1 commit fc8786a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
4 changes: 4 additions & 0 deletions guides/howto-deploy-java-openliberty-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ After creating and connecting to the cluster, install the [Open Liberty Operator
3. Select **Open Liberty Operator** from the search results.
4. Select **Install**.
5. In the popup **Create Operator Subscription**, check **All namespaces on the cluster (default)** for **Installation Mode**, **beta** for **Update Channel**, and **Automatic** for **Approval Strategy**:

![install-operator](./media/howto-deploy-java-openliberty-app/install-operator.png)
6. Select **Subscribe** and wait a minute or two until the Open Liberty Operator is displayed.
7. Observe the Open Liberty Operator with status of "Succeeded". If you do not, trouble shoot and resolve the problem before continuing.
Expand All @@ -62,6 +63,7 @@ You can use your ACR instance as a source of container images with your ARO 4 cl
1. Log in to the OpenShift web console from your browser.
2. Navigate to **Administration** > **Namespaces** > **Create Namespace**.
3. Fill in "open-liberty-demo" for **Name** and select **Create**, as shown next.

![create-namespace](./media/howto-deploy-java-openliberty-app/create-namespace.png)
4. [Create a service principal](https://docs.microsoft.com/azure/container-registry/container-registry-auth-kubernetes#create-a-service-principal) with access to your ACR instance. Specify `<container-registry-name>` as name of your container registry. Take note of `Service principal ID` and `Service principal password` in the output.
5. [Create an image pull secret](https://docs.microsoft.com/azure/container-registry/container-registry-auth-kubernetes#create-an-image-pull-secret) to store information needed to authenticate to your ACR instance. Specify `<secret-name>` as **registry-secret**, `<namespace>` as **open-liberty-demo**, `<container-registry-name>` as name of your container registry, `service-principal-ID` and `service-principal-password` as the ones you noted down in the previous step.
Expand Down Expand Up @@ -131,6 +133,7 @@ To run the application on Open Liberty, you need to create an Open Liberty serve
```

7. Open [http://localhost:9080/](http://localhost:9080/) in your browser to visit the application home page. The application will look similar to the following:

![javaee-cafe-web-ui](./media/howto-deploy-java-openliberty-app/javaee-cafe-web-ui.png)
8. Press **Control-C** to stop the application and Open Liberty server.

Expand Down Expand Up @@ -216,6 +219,7 @@ Now you can deploy the sample Liberty application to the Azure Red Hat OpenShift
1. Log in to the OpenShift web console from your browser.
2. Navigate to **Operators** > **Installed Operators** > **Open Liberty Operator** > **Open Liberty Application**. The navigation of items in the user interface mirrors the actual containment hierarchy of technologies in use.
![ARO Java Containment](./media/howto-deploy-java-openliberty-app/aro-java-containment.png)
3. Select **Create OpenLibertyApplication**
4. Replace the generated yaml with yours, which is located at `<path-to-repo>/2-simple/openlibertyapplication.yaml`.
Expand Down
4 changes: 4 additions & 0 deletions guides/howto-integrate-aad-oidc.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,18 @@ Once the application is up and running, open [https://localhost:9443](https://lo

1. Sign in as a user, who doesn't belong to the admin group you created before.
2. Update your password since this is the first time you are signing in.

![update-your-password](./media/howto-integrate-aad-oidc/update-your-password.png)
3. Accept permission requested by the application.

![accept-permissions-requested](./media/howto-integrate-aad-oidc/accept-permissions-requested.png)
4. You will see the email address of your AAD account displayed in the application home page, where the coffee **Delete** button is **disabled**.

![delete-button-disabled](./media/howto-integrate-aad-oidc/delete-button-disabled.png)
5. Close the **InPrivate** window > open a new **InPrivate** window > sign in as another user, who does belong to the admin group you created before.
6. Update your password if necessary. Accept permission requested if necessary.
7. You will see the email address of your AAD account displayed in the application home page, where the coffee **Delete** button is **enabled** now.

![delete-button-enabled](./media/howto-integrate-aad-oidc/delete-button-enabled.png)
8. Press **Control-C** to stop the application and Open Liberty server.

Expand Down
6 changes: 5 additions & 1 deletion guides/howto-integrate-azure-managed-databases.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ Follow the instructions below to set up an Azure SQL Database single database fo
>
> * At **Basics** step, write down **Database name**, ***Server name**.database.windows.net*, **Server admin login** and **Password**.
> * At **Networking** step, set **Connectivity method** to **Public endpoint**, **Allow Azure services and resources to access this server** to **Yes**, and **Add current client IP address** to **Yes**.
> ![create-sql-database-networking](./media/howto-integrate-azure-managed-databases/create-sql-database-networking.png)
>
> ![create-sql-database-networking](./media/howto-integrate-azure-managed-databases/create-sql-database-networking.png)
> * At **Additional settings** step, set **Enable advanced data security** to **Not now**.
2. Once your database is created, open **your SQL server** > **Firewalls and virtual networks** > Set **Minimal TLS Version** to **>1.0** > Click **Save**.

![sql-database-minimum-TLS-version](./media/howto-integrate-azure-managed-databases/sql-database-minimum-TLS-version.png)
3. Open **your SQL database** > **Connection strings** > Select **JDBC**. Write down the **Port number** following sql server address. For example, **1433** is the port number in the example below.

![sql-server-jdbc-connection-string](./media/howto-integrate-azure-managed-databases/sql-server-jdbc-connection-string.png)

### Prepare your application
Expand Down Expand Up @@ -188,8 +190,10 @@ Follow the instructions below to set up an Azure Database for PostgreSQL server
> [!NOTE]
> At **Basics** step, write down **Admin username** and **Password**.
2. Once your database is created, open **your Azure Database for PostgreSQL server** > **Connection security** > Set **Allow access to Azure services** to **Yes** > Click **+ Add current client IP address** > Click **Save**.

![postgres-connection-security](./media/howto-integrate-azure-managed-databases/postgres-connection-security.png)
3. Open **your Azure Database for PostgreSQL server** > **Connection strings** > **JDBC**. Write down the **Server name** and **Port number** in ***Server name**.postgres.database.azure.com:**Port number*** format.

![postgre-server-jdbc-connection-string](./media/howto-integrate-azure-managed-databases/postgre-server-jdbc-connection-string.png)

### Prepare your application (PostgreSQL)
Expand Down
7 changes: 7 additions & 0 deletions guides/howto-integrate-elasticsearch-stack.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ Follow the instructions below to create a deployment for the hosted Elasticsearc
2. Log into [Elastic Cloud](https://cloud.elastic.co/login) using your free trial account.
3. Click **Create deployment**.
4. **Name your deployment** > Select **Azure as cloud platform** > **Leave defaults for others** or customize per your needs > Click **Create deployment**.

![create-elasticsearch-service-deployment](./media/howto-integrate-elasticsearch-stack/create-elasticsearch-service-deployment.png)
5. Wait until the deployment is created.

![elasticsearch-service-deployment-created](./media/howto-integrate-elasticsearch-stack/elasticsearch-service-deployment-created.png)
6. Write down **User name**, **Password**, and **Cloud ID** for further usage.

Expand Down Expand Up @@ -104,12 +106,15 @@ As long as the application logs are shipped to the Elasticsearch cluster, they c
1. Log into [Elastic Cloud](https://cloud.elastic.co/login).
2. Find your deployment from **Elasticsearch Service**, click **Kibana** to open its web console.
3. From the top-left of the home page, click menu icon to expand the top-level menu items. Click **Stack Management** > **Index Patterns** > **Create index pattern**.

![create-index-pattern-define](./media/howto-integrate-elasticsearch-stack/create-index-pattern-define.png)
4. Set **filebeat-\*** as index pattern. Click **Next step**.

![create-index-pattern-settings](./media/howto-integrate-elasticsearch-stack/create-index-pattern-settings.png)
5. Select **@timestamp** as **Time Filter field name** > Click **Create index pattern**.
6. From the top-left of the home page, click menu icon to expand the top-level menu items. Click **Discover**. Check index pattern **filebeat-\*** is selected.
7. Add **host&#46;name**, **loglevel**, and **message** from **Available fields** into **Selected fields**. Discover application logs from the work area of the page.

![discover-application-logs](./media/howto-integrate-elasticsearch-stack/discover-application-logs.png)

## Distribute your application logs to EFK stack installed on ARO 4 cluster
Expand Down Expand Up @@ -203,9 +208,11 @@ As long as the application logs are shipped to the Elasticsearch cluster, they c
2. In the new opened window, click **Log in with OpenShift**. Log in with user **kubeadmin**.
3. In **Authorize Access** page, click **Allow selected permissions**. Wait until Kibana web console is displayed.
4. Open **Management** > **Index Patterns** > Select **project.\*** > Click **Refresh field list** icon at top-right of the page.

![refresh-field-list.png](./media/howto-integrate-elasticsearch-stack/refresh-field-list.png)
5. Click **Discover**. Select index pattern **project.\*** from the dropdown list.
6. Add **kubernetes.namespace_name**, **kubernetes.pod_name**, **loglevel**, and **message** from **Available Fields** into **Selected Fields**. Discover application logs from the work area of the page.

![discover-application-logs-cluster-logging](./media/howto-integrate-elasticsearch-stack/discover-application-logs-cluster-logging.png)

## Next steps
Expand Down

0 comments on commit fc8786a

Please sign in to comment.