Skip to content

Commit 92580cb

Browse files
committed
Merge branch 'master' into mz/unleash-docs
2 parents 543c3e2 + 95b7e02 commit 92580cb

File tree

48 files changed

+379
-223
lines changed

Some content is hidden

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

48 files changed

+379
-223
lines changed

apps/changelog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@radix-ui/themes": "^3.1.3",
2727
"@sentry/nextjs": "8.36.0",
2828
"@spotlightjs/spotlight": "^2.1.1",
29-
"next": "15.0.3",
29+
"next": "15.1.2",
3030
"next-auth": "^4.24.5",
3131
"next-mdx-remote": "^4.4.1",
3232
"nextjs-toploader": "^1.6.6",

develop-docs/integrations/azuredevops.mdx

Lines changed: 0 additions & 27 deletions
This file was deleted.
389 KB
Loading
36.9 KB
Loading
27.5 KB
Loading
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
title: Azure DevOps Integration
3+
sidebar_title: Azure DevOps
4+
---
5+
6+
## Create an Azure Application
7+
8+
Log into your Azure DevOps account or create a new one, and ensure you have a project set up.
9+
10+
Make sure the organization has third-party access via OAuth enabled in the organization settings.
11+
![3p-oauth](./3p-oauth.png)
12+
13+
14+
To use the Azure DevOps integration you'll need to create an application.
15+
16+
To start, you will need access to a [Microsoft Entra Admin Portal](https://entra.microsoft.com/#home)
17+
18+
![Register App](./register-app.png)
19+
20+
21+
When configuring the app, use the following values:
22+
23+
| Setting | Value |
24+
| ------------------------------- | -------------------------------------------------------------------------------------------------- |
25+
| Supported account types | Accounts in any organizational directory |
26+
| Redirect URI | `{YOUR_DOMAIN}/extensions/vsts/setup` |
27+
28+
<Note>
29+
30+
Take note of your App ID as we'll need it later.
31+
![App ID](./app-id.png)
32+
33+
</Note>
34+
35+
Next go to Manager -> API Permissions to add the following permissions:
36+
* Azure DevOps (`vso.code`, `vso.graph`, `vso.work_item`, `vso.service_endpoint`)
37+
* Microsoft Graph (`User.Read`) (This should be added by default)
38+
39+
![Permissions](./perms.png)
40+
41+
Go to the "Certificates & secrets" tab and create a new client secret. Make sure you copy the secret as we'll need it later.
42+
43+
![Client Secret](./client-secret.png)
44+
45+
Add the App ID and Client Secret to `devlocal.py` like this:
46+
47+
```python
48+
# Azure DevOps #
49+
SENTRY_OPTIONS["vsts_new.client-id"] = your-app-id
50+
SENTRY_OPTIONS["vsts_new.client-secret"] = your-client-secret
51+
```
52+
53+
You can also add the App ID and Client Secret to `config.yml` like this:
54+
55+
```yml
56+
# Azure DevOps #
57+
vsts_new.client-id: your-app-id
58+
vsts_new.client-secret: your-client-secret
59+
```
60+
61+
You will also need to enable the feature flag to use the new Azure DevOps integration.
62+
Enable the `migrate-azure-devops-integration` feature flag in your organization.
63+
Add the following to your `devlocal.py` file:
64+
65+
```python
66+
SENTRY_FEATURES["organizations:migrate-azure-devops-integration"] = True
67+
```
68+
69+
<Alert title="Feature Flag" level="info">
70+
71+
This is a temporary measure until we fully migrate to the new Azure DevOps integration and remove references to the old one.
72+
73+
</Alert>
74+
75+
Follow our [documentation on installing and configuring the Azure DevOps integration](https://docs.sentry.io/organization/integrations/source-code-mgmt/azure-devops/) to finish installation and use the integration.
169 KB
Loading
299 KB
Loading

develop-docs/integrations/discord/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ discord.client-secret: "<client secret>"
2828
discord.bot-token: "<bot token>"
2929
```
3030
31-
**NOTE**: If you're doing local Sentry development, you should use a tool like Ngrok and add `system.url-prefix: "https://<your_subdomain>.ngrok.io"` to your `~/.sentry/config.yml`. Otherwise, installing the Discord bot won't work, as it will not be able to communicate with your local Sentry instance.
31+
**NOTE**: If you're doing local Sentry development, you should use a tool like Ngrok to expose your local Sentry instance to the internet. Otherwise, the OAuth2 Redirect URI will not work.
3232
3333
After you update the <code>config.yml</code>, restart your Sentry server to continue the setup process.
3434

develop-docs/integrations/slack/index.mdx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@ After naming your app and connecting your workspace, navigate to __Basic Informa
1313

1414
Here’s where you’ll connect your self-hosted Sentry instance to your newly created Slack app.
1515

16-
Copy your Client ID, Client Secret, and Signing Secret and paste them into <code>config.yml</code>.
16+
Copy your Client ID, Client Secret, and Signing Secret and paste them into `~/.sentry/config.yml` or `~/.sentry/sentry.conf.py`.
1717

1818
```yaml
1919
slack.client-id: <client id>
2020
slack.client-secret: <client secret>
2121
slack.signing-secret: <signing secret>
2222
```
2323
24-
**NOTE**: If you're doing local Sentry development, you should use a tool like Ngrok and add `system.url-prefix: "https://<your_subdomain>.ngrok.io"` to your `~/.sentry/config.yml`, otherwise, installing the Slack APP will complain because the redirect URI points to `localhost:8000`. Also, install the Slack integration from the ngrok subdomain or it will fail to install.
24+
If you're a Sentry employee, you can set the `slack.client-id` and `slack.client-secret` in `devlocal.py` inside `getsentry` instead.
2525

26-
After you update the <code>config.yml</code> you need to restart your Sentry server to continue configuring the Slack app.
26+
**NOTE**: If you're doing local Sentry development, you should usse ngrok and install the Slack integration from the ngrok subdomain or it will fail to install. Refer to [Developing with Ngrok](https://develop.sentry.dev/development-infrastructure/ngrok/) for more information.
2727

28-
<Alert title="Note" level="info">
28+
After you update the `config.yml`, `sentry.conf.py`, or `devlocal.py` you need to restart your Sentry server to continue configuring the Slack app.
29+
30+
<Alert title="Note (for self-hosted users)" level="info">
2931
After changing configuration files, re-run the <code>./install.sh</code> script, to rebuild and restart the containers. See the <Link to="/self-hosted/#configuration">configuration section</Link> for more information.
3032
</Alert>
3133

@@ -112,8 +114,13 @@ Navigate to __Slash Commands__ under __Features__. Click __Create New Command__
112114

113115
| Setting | Value |
114116
| ------------------------------- | --------------------------------------------- |
115-
| Command | `/sentry` |
116-
| Request URL | `{YOUR_DOMAIN}/extensions/slack/commands/` |
117+
| Command | `/{yourname}-sentry` |
118+
| Request URL | `{YOUR_DOMAIN}/extensions/slack/commands/` |
119+
120+
121+
<Alert title="Note" level="info">
122+
When creating the slash command, don’t use `/sentry`. Do something like `/{your_name}-sentry`. If multiple apps are installed with the same slash command, the most recently installed one takes over.
123+
</Alert>
117124

118125
At the bottom of the page, click __Save__.
119126

0 commit comments

Comments
 (0)