Skip to content

Commit

Permalink
Merge pull request #556 from RizaFarheen/main
Browse files Browse the repository at this point in the history
Updates based on latest UI Changes - 1
  • Loading branch information
nhandt2021 authored Nov 8, 2023
2 parents 2e7793f + ced2156 commit dec2851
Show file tree
Hide file tree
Showing 24 changed files with 45 additions and 40 deletions.
8 changes: 4 additions & 4 deletions docs/access-control-and-security/applications.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Each application can generate one or more sets of keys and secrets, and these pa
### Configuring Application​

To create a new application,
1. From the left menu navigation, navigate to **ACCESS CONTROL > Applications**.
2. Click **Create Application** and provide an app name.
1. From the left menu navigation, navigate to **Access Control > Applications**.
2. Click **Create application** and provide an app name.
3. Once your application is created, click the edit button next to its name.


Expand All @@ -26,7 +26,7 @@ The following roles can be granted to the application.
* **Application API**: Create and manage applications.

### Generating Access Keys​
Once your application's permission levels are chosen, access must be granted to the application. This is done by generating an Access Key. Click **Create Access Key** to generate a unique **Key Id** and **Key Secret**. These values are shown only once, so ensure to copy the credentials and store them privately.
Once your application's permission levels are chosen, access must be granted to the application. This is done by generating an Access Key. Click **Create access key** to generate a unique **Key Id** and **Key Secret**. These values are shown only once, so ensure to copy the credentials and store them privately.

Once a key has been created, you can perform two actions on the key:

Expand All @@ -38,7 +38,7 @@ Once a key has been created, you can perform two actions on the key:
### Adding Permissions​
In this section, you can provide the application with access to workflows, tasks, secrets, or tags. To add the permissions,
1. Click **+Add Permission** from the **Workflow and Task Permissions** section.
2. Choose the required Workflow/Task/Secret/Tag/Domain in the pop-up window.
2. Choose the required Workflow/Task/Secret/Tag/Domain/Integration/Prompt in the pop-up window.
<ul>
<li><b>Domain</b> - This can be used if you have set up an external worker with a task to domain mapping. You need to provide permission for the domain for the entire application to poll and update the tasks. </li>
</ul>
Expand Down
16 changes: 9 additions & 7 deletions docs/access-control-and-security/tags.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ You can either add tags directly to individual workflows/tasks/secrets/scheduler
## Adding Tags to Workflow​s​

To add a tag to a workflow,
1. From the left menu, navigate to **WORKFLOWS > Definitions** and find the workflow you wish to tag.
1. From the left menu, navigate to **Definitions > Workflow** and find the workflow you wish to tag.
2. In the **Actions** column, click the tag icon.

<p align="center"><img src="/content/img/adding-tags-to-workflow.png" alt="Adding a tag to an already created workflow" width="90%" height="auto"></img></p>
Expand All @@ -19,23 +19,25 @@ This will open a pop-up window that allows you to add a new tag. Type a tag name
## Adding Tags to Task​s​

To add a tag to a task,
1. From the left menu, navigate to the **TASKS > Definitions** and find the task you wish to tag.
1. From the left menu, navigate to the **Definitions > Task** and find the task you wish to tag.
2. In the **Actions** column, click the tag icon.

<p align="center"><img src="/content/img/adding-tag-to-task.png" alt="Adding a tag to an already created task" width="90%" height="auto"></img></p>

This will open a pop-up window that allows you to add a new tag. Type a tag name in the format **key:value** and press enter to create new tags. You may also remove tags from the same window by clicking the "X" next to the tag you wish to delete.

## Adding Tags to Scheduler​

To add a tag to a scheduler,
1. From the left menu, navigate to **SCHEDULER > Definitions** and find the scheduler you wish to tag.
1. From the left menu, navigate to **Definitions > Scheduler** and find the scheduler you wish to tag.
2. In the **Actions** column, click the tag icon.

This will open a pop-up window that allows you to add a new tag. Type a tag name in the format **key:value** and press enter to create new tags. You may also remove tags from the same window by clicking the "X" next to the tag you wish to delete.

## Adding Tags to Secrets​

To add a tag to a secret,
1. From the left menu, navigate to **Secrets** and find the secret you wish to tag.
1. From the left menu, navigate to **Definitions > Secrets** and find the secret you wish to tag.
2. In the **Actions** column, click the tag icon.

This will open a pop-up window that allows you to add a new tag. Type a tag name in the format **key:value** and press enter to create new tags. You may also remove tags from the same window by clicking the "X" next to the tag you wish to delete.
Expand All @@ -50,8 +52,8 @@ Suppose you have a group of users from the accounts team and want to share the w

To add permissions to the group,
1. Ensure that the workflow is tagged with the tag **team:accounts**. (If permission is to be shared for tasks/secrets, you need to add the tags to the corresponding items.)
2. Navigate to **ACCESS CONTROL > Groups** and click the edit icon near your group name.
3. From the **Workflow and Task Permissions** section, click **+Add Permission**.
2. Navigate to **Access Control > Groups** and click the edit icon near your group name.
3. From the **Permissions** section, click **+Add Permission**.
4. Click on the **Tag** section, choose **team:accounts** tag, and provide EXECUTE permission. You must also provide READ permission to list the workflows/tasks/schedulers/secrets in your Conductor console.
5. Clicking **Add Permission** adds the tag to the Group.

Expand All @@ -66,7 +68,7 @@ You can also allow the applications created to have explicit permissions over th
Suppose you want to provide access to the tag “**team:accounts**” for your application;

1. Ensure that the workflow/task/secret/scheduler is tagged with the tag **team:accounts**.
2. Then, navigate to **ACCESS CONTROL > Applications** and click the edit icon near your app name.
2. Then, navigate to **Access Control > Applications** and click the edit icon near your app name.
3. From the **Workflow and Task Permissions** section, click **+Add Permission**.
4. Click on the **Tag** section, choose **team:accounts** tag, and provide the required permission.
5. Clicking **Add Permission** adds the tag to the application.
Expand Down
23 changes: 11 additions & 12 deletions docs/access-control-and-security/users-and-groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ This feature is available only to the Admins of an Orkes Conductor instance.

To invite a user to your Orkes Cloud instance,

1. From your Conductor server, navigate to **ACCESS CONTROL > Users** from the left menu.
1. From your Conductor server, navigate to **Access Control > Users** from the left menu.
2. Click the **Create User** button.
3. You need to fill in the following user details:<ul><li>**Email** - Enter the email address of the user.</li><li>**Name** - Provide the user’s name.</li><li>**Roles** - Choose the access level you wish the user to have. The available Conductor roles are *Admin*, *User*, *Metadata Manager*, *Workflow Manager*, and *Read Only User*.</li></ul>
4. Click **Create**, and an email invitation will be sent to the user with the instructions to access the Conductor instance.
3. You need to fill in the following user details:<ul><li>**User id** - Enter the email address of the user.</li><li>**Name** - Provide the user’s name.</li><li>**Permissions** - Choose the access level you wish the user to have. The available Conductor roles are *Admin*, *User*, *Metadata Manager*, *Workflow Manager*, and *Read Only User*.</li></ul>
4. Click **Save**, and the user can now access the Conductor instance.

### User Roles​​

Expand All @@ -29,7 +29,7 @@ A user can have the following roles:

### Editing Users​

To change the access for a specific user, click on the edit button next to the user, and change the role by clicking the toggle button for the relevant roles.
To change the permission for a specific user, click on the edit button next to the user, and update with the required permissions.

<p align="center"><img src="/content/img/edit-user-roles.png" alt="Editing user roles in Conductor" width="90%" height="auto"></img></p>

Expand All @@ -41,23 +41,22 @@ Groups are a way to share workflows and tasks among your team quickly.

### Creating Groups​​
To create a user group:
1. From the left menu, navigate to **ACCESS CONTROL > Groups**.
2. Click **Create Group** and provide the following details:<ul><li>**Group ID** - Provide a name to identify your group.</li><li>**Description** - Provide a suitable description for the group.</li></ul>
3. Click **Create**.
1. From the left menu, navigate to **Access Control > Groups**.
2. Click **Create Group** and provide the following details:<ul><li>**Name** - Provide a name to identify your group.</li><li>**Description** - Provide a suitable description for the group.</li><li>**Permissions** - Choose the required permission for the group. The Group can take the roles *Admin*, *User*, *Metadata Manager*, *Workflow Manager* or *Read Only User*. </li></ul>
3. Click **Save**.

<p align="center"><img src="/content/img/creating-groups.png" alt="Creating Groups in Conductor" width="90%" height="auto"></img></p>

4. Once the group is created, you can assign a role to the group. The Group can take the roles *Admin*, *User*, *Metadata Manager*, *Workflow Manager* or *Read Only User*.
5. You can add members by clicking **+Add User** from the **Members** section. You can add only the users that have already been created/invited. If the user you are looking for has not been added, you can invite and then add them to the groups.
4. You can add members by clicking **+Add User** from the **Members** section. You can add only the users that have already been created/invited. If the user you are looking for has not been added, you can invite and then add them to the groups.

**Workflow and Tasks Permissions** is an additional section where you can limit the group members' access to the permitted workflows, tasks, secrets & tags.
**Permissions** is an additional section where you can limit the group members' access to the permitted workflows, tasks, secrets, tags, domains, integrations & prompts.

6. Click **+Add Permission**, and you can choose the group to have access to selected Workflows/Tasks/Secrets/Tags/Domains. Permissions that can be granted include Read, Create, Update, Execute & Delete.
6. Click **+Add Permission**, and you can choose the group to have access to selected Workflows/Tasks/Secrets/Tags/Domains/Integrations/Prompts. Permissions that can be granted include Read, Create, Update, Execute & Delete.

<p align="center"><img src="/content/img/adding-permissions-for-applications.png" alt="Granting access to specific tasks and workflows" width="90%" height="auto"></img></p>

:::note
Even if certain permissions are granted under the **Workflow and Tasks Permissions** section, the chosen role supersedes these permissions. This means that if both the **Workflow and Tasks Permissions** section is configured and a role is selected, the role always supersedes the other.
Even if certain permissions are granted under the **Permissions** section, the chosen role supersedes these permissions. This means that if both the **Permissions** section is configured and a role is selected, the role always supersedes the other.
:::

### Group Roles​
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guides/debugging-workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Orkes Conductor provides a visual representation of workflows that aids in quick

## Searching/Viewing Workflow Executions

All recent workflow executions are listed on the **WORKFLOWS > Executions** page. This view is filtered by the permissions of the user by default, i.e., users can view the execution of only the permitted workflows.
All recent workflow executions are listed on the **Executions > Workflow** page. This view is filtered by the permissions of the user by default, i.e., users can view the execution of only the permitted workflows.

<p align="center"><img src="/content/img/workflow-executions.png" alt="Workflow Executions page" width="90%"
height="auto"/></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guides/metrics-and-observability.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Orkes Conductor uses the popular platform Prometheus for recording a rich set of

In this document, we’ve included a sample dashboard set using Prometheus & Grafana.

1. To access your dashboard, navigate to **Metrics & Alerts** from your Conductor console. If you cannot see the “Metrics & Alerts” option on your Conductor console, [please reach out to our team](https://app.slack.com/client/T02KG20GJ1Z/C02KJ820XPW).
1. To access your dashboard, navigate to **Metrics** from your Conductor console. If you cannot see this option on your Conductor console, [please reach out to our team](https://app.slack.com/client/T02KG20GJ1Z/C02KJ820XPW).

<p align="center"><img src="/content/img/accessing-dashboard.png" alt="Accessing dashboard from Conductor Console" width="100%" height="auto"></img></p>

Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guides/monitoring-task-queues.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The task queues are the collection of tasks waiting to be executed. It is useful

## Viewing Task Queues

You can monitor your task queues by navigating to **Tasks > Queue Monitor**.
You can monitor your task queues by navigating to **Executions > Queue Monitor**.

<p align="center"><img src="/content/img/task-queue-monitor-view.png" alt="Monitoring Task Queues in Conductor" width="100%" height="auto"></img></p>

Expand Down
22 changes: 11 additions & 11 deletions docs/developer-guides/scheduling-workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ Examples could be:

For creating a schedule,

1. From your Conductor server, navigate to **SCHEDULER** > **Definitions**. This page displays a list of all the defined schedules.
1. From your Conductor server, navigate to **Definitions > Scheduler**. This page displays a list of all the defined schedules.
2. Click the **Define Schedule** button in the top right corner.

The following parameters can be used to configure the schedule:

| Attribute | Description |
| ------------------------------------- | ------------------------------------ |
| Schedule Name | Unique name for the schedule. Ensure that the schedule name contains no spaces or special characters. |
| Name | Unique name for the schedule. Ensure that the schedule name contains no spaces or special characters. |
| Cron Expression | The cron expression is the schedule that the workflow will run on. You can either input the cron expression or choose from the available templates. See the section [Cron Expression](/content/developer-guides/scheduling-workflows#cron-expression) below for detailed information regarding this. |
| Workflow Name | Name of the workflow to be run. The author of the scheduler should have execution permission for the workflow.|
| Workflow Version | Selected Workflow may have different versions. Choose the version to be used in this schedule. If left blank, the latest version would be run. |
| Input Parameters | Provide fixed input values for the workflow as a JSON object. This field is optional. |
| Correlation Id | User-supplied ID to correlate or search the scheduled workflows. |
| Schedule Start | Choose the date & time for the scheduler to start running. It should be in the format **yyyy-mm-dd hh:mm (a/p)m**. This field is optional. |
| Schedule End | Choose the date & time for the scheduler to stop running. It should be in the format **yyyy-mm-dd hh:mm (a/p)m**. This field is optional. |
| Task to Domain Mapping | You can use the task to domain mapping to limit the workflow execution to specific domains. This field is optional. |
| Start Schedule Paused? | If selected, the schedule will be paused (so it will not run) upon creation. It is helpful when you don’t want to run the workflow scheduler, such as during maintenance. To resume the scheduled executions, this needs to be unpaused. |
| Workflow name | Name of the workflow to be run. The author of the scheduler should have execution permission for the workflow.|
| Workflow version | Selected Workflow may have different versions. Choose the version to be used in this schedule. If left blank, the latest version would be run. |
| Input params | Provide fixed input values for the workflow as a JSON object. This field is optional. |
| Correlation id | User-supplied ID to correlate or search the scheduled workflows. |
| Schedule start | Choose the date & time for the scheduler to start running. It should be in the format **yyyy-mm-dd hh:mm (a/p)m**. This field is optional. |
| Schedule end | Choose the date & time for the scheduler to stop running. It should be in the format **yyyy-mm-dd hh:mm (a/p)m**. This field is optional. |
| Task to domain mapping | You can use the task to domain mapping to limit the workflow execution to specific domains. This field is optional. |
| Start schedule paused? | If selected, the schedule will be paused (so it will not run) upon creation. It is helpful when you don’t want to run the workflow scheduler, such as during maintenance. To resume the scheduled executions, this needs to be unpaused. |

3. Click **Save Schedule**.

Expand Down Expand Up @@ -105,7 +105,7 @@ Macros are also supported when setting a schedule.

## Viewing Executions

Once the schedulers are defined, you can view the executions from the **Scheduler > Executions** page.
Once the schedulers are defined, you can view the executions from the **Executions > Scheduler** page.

<p align="center"><img src="/content/img/scheduler-executions.jpg" alt="Scheduler Executions View" width="100%" height="auto"></img></p>

Expand Down
6 changes: 3 additions & 3 deletions docs/developer-guides/secrets-in-conductor.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ used to hide these sensitive values on the UI. These values include usernames, p

Follow the below steps to create and store secrets in Conductor:

1. From your Orkes Conductor Console, navigate to the **Secrets** option from the left menu. The *Secrets* page lists all the secrets associated with your account that you have access to.
1. From your Orkes Conductor Console, navigate to the **Definitions > Secrets** option from the left menu. The *Secrets* page lists all the secrets associated with your account that you have access to.
2. Click **Add Secrets** and provide the following values:<ul><li>**Secret Name** - Reference name for your secret.</li><li>**Secret Value** - Provide the value to be stored.</li></ul>
3. Clicking **Add** saves the secret.

Expand All @@ -25,13 +25,13 @@ We can manage secrets using the following ways. In each of these methods, the pr

### Using UI

Users with access to the secret can update the secret on the UI. Access the left menu "Secrets".
Users with access to the secret can update the secret on the UI. Access the left menu "Definitions > Secrets".

### Using APIs

The following API endpoints can be invoked with credentials that have permission to update the secret value.

### Using a Worker
#### Using a Worker

A common use case is when a secret managed by Conductor is an access token with an expiry. Tokens that expire require a periodic refresh, and this can be easily achieved using a system worker task that can update the secret. This system worker does the same function as a custom worker updating a secret.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ Any changes to the definition won’t impact if the execution is already running

In this case, to be consistent with your business flow, you can leverage the [skip task API](https://orkes.io/content/reference-docs/api/workflow/skip-task-from-workflow) to skip the task execution that was already completed.

### API Method

You can use the [workflow upgrade API](/content/reference-docs/api/workflow/upgrade-workflow) to upgrade the running workflow to another version.

### SDKs

#### C#
Expand Down
Binary file modified static/img/accessing-dashboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/adding-permissions-for-applications.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/adding-tag-to-task.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/adding-tags-to-a-user-group-in-conductor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/adding-tags-to-application-in-orkes-conductor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/adding-tags-to-workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/creating-groups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/edit-user-roles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/editing-tags-in-conductor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/scheduler-executions.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/step-1-terminate-workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/step-2-restart-with-latest-definitions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/task-queue-monitor-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/task-to-domain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/workflow-executions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dec2851

Please sign in to comment.