Skip to content

Commit 107af17

Browse files
authored
Merge branch 'master' into feat/integrations-agentline
2 parents 3cc7e95 + 6a33ebb commit 107af17

163 files changed

Lines changed: 5701 additions & 556 deletions

File tree

Some content is hidden

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

.github/workflows/docker.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ jobs:
7272
SERVER=$(docker ps -q -f status=running -f name=^/${CONTAINER_NAME}$)
7373
if [ ! "${SERVER}" ]; then
7474
echo "Server container doesn't exist"
75+
docker compose logs --no-color
7576
exit 1
7677
fi
7778
7879
CONTAINER_NAME=nango-db
7980
DB=$(docker ps -q -f status=running -f name=^/${CONTAINER_NAME}$)
8081
if [ ! "${DB}" ]; then
8182
echo "DB container doesn't exist"
83+
docker compose logs --no-color
8284
exit 1
8385
fi
8486
shell: bash

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN true \
7979

8080
# Clean dev dependencies
8181
RUN true \
82-
&& npm prune --omit=dev --omit=peer --omit=optional
82+
&& npm prune --omit=dev --omit=optional
8383

8484
# ---- Web ----
8585
# Resulting new, minimal image

docs/api-integrations/ninjaone-rmm-oauth2/how-to-register-your-own-ninjaone-rmm-api-oauth-app.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This guide shows you how to register your own app with NinjaOne RMM to obtain yo
88

99
<Steps>
1010
<Step title="Navigate to the API settings">
11-
1. Log in to your NinjaOne instance at [app.ninjarmm.com](https://app.ninjarmm.com).
11+
1. Log in to your NinjaOne instance (e.g. [app.ninjarmm.com](https://app.ninjarmm.com) for North America, `us2.ninjarmm.com`, `eu.ninjarmm.com`, `ca.ninjarmm.com`, or `oc.ninjarmm.com` depending on where your tenant is hosted).
1212
2. Navigate to **Administration** > **Apps** > **API**.
1313
3. Click on the **Client App IDs** tab.
1414
</Step>
@@ -37,4 +37,5 @@ For more details, see [NinjaOne's Authorization Code Flow documentation](https:/
3737

3838
- The **Client Secret** is only displayed once after creation. If you lose it, you'll need to create a new application.
3939
- NinjaOne access tokens expire within approximately 1 hour. Include the `offline_access` scope to ensure refresh tokens are issued for automatic token renewal.
40+
- NinjaOne tenants are hosted on regional instances (`app.ninjarmm.com`, `us2.ninjarmm.com`, `eu.ninjarmm.com`, `ca.ninjarmm.com`, `oc.ninjarmm.com`). OAuth credentials and API access only work against the tenant's own instance. Set the `instance` connection config to the tenant's hostname when creating a connection; existing connections without an `instance` fall back to `app.ninjarmm.com`.
4041
- This OAuth2 Authorization Code provider supports endpoints that require user-context authorization (e.g., running scripts on devices). If you only need machine-to-machine access, see the [NinjaOne RMM (Client Credentials)](/integrations/all/ninjaone-rmm) integration instead.

docs/api-integrations/zendesk/how-to-register-your-own-zendesk-api-oauth-app.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Zendesk has two kinds of OAuth apps:
1111
- Helpdesk/support apps
1212
- CRM apps
1313

14-
Nango currently only supports OAuth for the Helpdesk apps. If you need CRM, reach out or contribute it :)
14+
This guide is for the Helpdesk app, used by this `zendesk` integration. For Zendesk's CRM product, use the [Zendesk Sell](/integrations/all/zendesk-sell) integration instead.
1515
</Note>
1616

1717
## Creating a Zendesk OAuth Client
@@ -35,8 +35,8 @@ Nango currently only supports OAuth for the Helpdesk apps. If you need CRM, reac
3535

3636
<Note>
3737
Important considerations when creating your OAuth client:
38-
- Make sure to create a Zendesk OAuth app (`https://<USER-SUBDOMAIN>.zendesk.com/admin/apps-integrations/apis/zendesk-api/settings`), _not_ a Zendesk Sales CRM OAuth app.
39-
- The subdomain is a critical part of the OAuth flow and API calls. It's the unique identifier in the Zendesk URL: `https://<subdomain>.zendesk.com`.
38+
- Make sure to create a Zendesk OAuth app (`https://<USER-SUBDOMAIN>.zendesk.com/admin/apps-integrations/apis/oauth-clients`), _not_ a Zendesk Sales CRM OAuth app.
39+
- The client you create is scoped to whichever Zendesk subdomain you're logged into (`https://<subdomain>.zendesk.com`). It'll only work for that subdomain unless you request a global client (see below).
4040
- When creating an OAuth client, make sure to fill out all fields, even those marked as "optional", especially if you plan to request a **global OAuth client** later.
4141
</Note>
4242

@@ -66,7 +66,7 @@ For security reasons, Zendesk doesn't allow developers to create their own globa
6666
## Additional Resources
6767

6868
Zendesk has [rate limits](https://developer.zendesk.com/api-reference/introduction/rate-limits/) that vary by plan. For more details on Zendesk's OAuth implementation, see:
69-
- [OAuth authentication guide](https://developer.zendesk.com/api-reference/sales-crm/authentication/reference/)
69+
- [OAuth authentication guide](https://developer.zendesk.com/documentation/authentication/using-oauth-to-authenticate-zendesk-api-requests-in-a-web-app/)
7070
- [OAuth client setup](https://support.zendesk.com/hc/en-us/articles/4408845965210-Using-OAuth-authentication-with-your-application#topic_s21_lfs_qk)
7171
- [OAuth scopes](https://support.zendesk.com/hc/en-us/articles/4408845965210-Using-OAuth-authentication-with-your-application#topic_qkc_dcm_dcc)
7272
- [Global OAuth client setup](https://developer.zendesk.com/documentation/marketplace/building-a-marketplace-app/set-up-a-global-oauth-client/)

docs/integrations/all/ninjaone-rmm/connect.mdx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ sidebarTitle: NinjaOne RMM
66
# Overview
77

88
To authenticate with NinjaOne RMM, you need:
9-
1. **Client ID** – Your OAuth application's Client ID
10-
2. **Client Secret** – Your OAuth application's Client Secret
9+
1. **Instance** – The hostname of the NinjaOne instance hosting your tenant (`app.ninjarmm.com` for North America, `us2.ninjarmm.com` for US2, `eu.ninjarmm.com` for EU, `ca.ninjarmm.com` for Canada, `oc.ninjarmm.com` for Oceania)
10+
2. **Client ID** – Your OAuth application's Client ID
11+
3. **Client Secret** – Your OAuth application's Client Secret
1112

1213
This guide walks you through creating an OAuth Client Application in NinjaOne RMM.
1314

@@ -19,7 +20,7 @@ This guide walks you through creating an OAuth Client Application in NinjaOne RM
1920

2021
#### Step 1: Create an OAuth Client Application
2122

22-
1. Log in to your NinjaOne instance at `https://app.ninjarmm.com`.
23+
1. Log in to your NinjaOne instance (`app.ninjarmm.com` for North America, `us2.ninjarmm.com` for US2, `eu.ninjarmm.com` for EU, `ca.ninjarmm.com` for Canada, or `oc.ninjarmm.com` for Oceania, depending on where your tenant is hosted).
2324
2. Navigate to **Administration** > **Apps** > **API**.
2425
<img src="/integrations/all/ninjaone-rmm/ninjaone_rmm_api_menu.png"/>
2526
3. Click on the **Client App IDs** tab.
@@ -41,8 +42,9 @@ This guide walks you through creating an OAuth Client Application in NinjaOne RM
4142

4243
Once you have your **Client ID** and **Client Secret**:
4344
1. Open the form where you need to authenticate with NinjaOne RMM.
44-
2. Enter your **Client ID** and **Client Secret** in their respective fields.
45-
3. Submit the form, and you should be successfully authenticated.
45+
2. Select the **Instance** hosting your NinjaOne tenant.
46+
3. Enter your **Client ID** and **Client Secret** in their respective fields.
47+
4. Submit the form, and you should be successfully authenticated.
4648

4749
<img src="/integrations/all/ninjaone-rmm/ninjaone_rmm_connect_form.png"/>
4850

41.3 KB
Loading

docs/snippets/generated/dynatrace-oauth/PreBuiltTooling.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Accordion title="✅ Read & write data">
1414
| Tools | Status |
1515
| - | - |
16-
| Pre-built integrations | 🚫 (time to contribute: &lt;48h) |
16+
| Pre-built integrations | |
1717
| API unification ||
1818
| 2-way sync ||
1919
| Webhooks from Nango on data modifications ||

0 commit comments

Comments
 (0)