Skip to content

Commit

Permalink
feat: Merge branch 'main' into feature/elastic
Browse files Browse the repository at this point in the history
  • Loading branch information
shahargl committed Jun 18, 2024
2 parents b780ff6 + b451994 commit acd3373
Show file tree
Hide file tree
Showing 119 changed files with 1,077 additions and 540 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,9 @@ storage

# otel files
tempo-data/

# docs
docs/node_modules/


scripts/automatic_extraction_rules.py
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ Workflow triggers can either be executed manually when an alert is activated or
<img width=32 height=32 src="https://github.com/keephq/keep/blob/main/keep-ui/public/icons/rollbar-icon.png?raw=true"/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<img width=32 height=32 src="https://github.com/keephq/keep/blob/main/keep-ui/public/icons/centreon-icon.png?raw=true"/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<img width=32 height=32 src="https://github.com/keephq/keep/blob/main/keep-ui/public/icons/netdata-icon.png?raw=true"/>
</p>
<h3 align="center">Ticketing tools</h2>
<p align="center">
Expand Down
8 changes: 8 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
How to run docs locally:

```
npm i -g mintlify
mintlify dev
```

Read more: https://mintlify.com/docs/development
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/assign-alert.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /alerts/{fingerprint}/assign/{last_received}
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/delete-alert.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /alerts
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/enrich-alert.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /alerts/enrich
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/get-alert-history.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /alerts/{fingerprint}/history
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/get-alert.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /alerts/{fingerprint}
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/get-all-alerts.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /alerts
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/receive-generic-event.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /alerts/event
---
3 changes: 3 additions & 0 deletions docs/api-ref/alerts/search-alerts.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /alerts/search
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/create-extraction-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /extraction
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/create-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /mapping
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/delete-extraction-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /extraction/{rule_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/delete-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /mapping/{rule_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/get-extraction-rules.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /extraction
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/get-rules.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /mapping
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/update-extraction-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /extraction/{rule_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/enrichment/update-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /mapping
---
3 changes: 3 additions & 0 deletions docs/api-ref/groups/get-groups.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /groups/
---
3 changes: 3 additions & 0 deletions docs/api-ref/preset/create-preset.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /preset
---
3 changes: 3 additions & 0 deletions docs/api-ref/preset/delete-preset.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /preset/{uuid}
---
3 changes: 3 additions & 0 deletions docs/api-ref/preset/get-presets.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /preset
---
3 changes: 3 additions & 0 deletions docs/api-ref/preset/update-preset.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /preset/{uuid}
---
3 changes: 3 additions & 0 deletions docs/api-ref/providers/get-installed-providers.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /providers/export
---
3 changes: 3 additions & 0 deletions docs/api-ref/providers/install-provider-oauth2.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /providers/install/oauth2/{provider_type}
---
3 changes: 3 additions & 0 deletions docs/api-ref/providers/invoke-provider-method.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /providers/{provider_id}/invoke/{method}
---
3 changes: 3 additions & 0 deletions docs/api-ref/providers/update-provider.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /providers/{provider_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/providers/validate-provider-scopes.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /providers/{provider_id}/scopes
---
3 changes: 3 additions & 0 deletions docs/api-ref/pusher/pusher-authentication.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /pusher/auth
---
3 changes: 3 additions & 0 deletions docs/api-ref/rules/create-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /rules
---
3 changes: 3 additions & 0 deletions docs/api-ref/rules/delete-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /rules/{rule_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/rules/get-rules.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /rules
---
3 changes: 3 additions & 0 deletions docs/api-ref/rules/update-rule.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /rules/{rule_id}
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/create-key.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /settings/apikey
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/create-user.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /settings/users
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/delete-api-key.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /settings/apikey/{keyId}
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/delete-smtp-settings.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /settings/smtp
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/delete-user.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /settings/users/{user_email}
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/get-keys.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /settings/apikeys
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/get-smtp-settings.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /settings/smtp
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/get-users.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /settings/users
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/test-smtp-settings.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /settings/smtp/test
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/update-api-key.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /settings/apikey
---
3 changes: 3 additions & 0 deletions docs/api-ref/settings/update-smtp-settings.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /settings/smtp
---
3 changes: 3 additions & 0 deletions docs/api-ref/status/status.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /status
---
3 changes: 3 additions & 0 deletions docs/api-ref/users/delete-user.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /users/{user_email}
---
3 changes: 3 additions & 0 deletions docs/api-ref/whoami/get-tenant-id.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /whoami
---
3 changes: 3 additions & 0 deletions docs/api-ref/workflows/get-raw-workflow-by-id.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /workflows/{workflow_id}/raw
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /workflows/executions
---
3 changes: 3 additions & 0 deletions docs/api-ref/workflows/get-workflow-executions.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /workflows/executions/list
---
3 changes: 3 additions & 0 deletions docs/api-ref/workflows/run-workflow-from-definition.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /workflows/test
---
3 changes: 3 additions & 0 deletions docs/api-ref/workflows/update-workflow-by-id.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: put /workflows/{workflow_id}
---
2 changes: 1 addition & 1 deletion docs/deployment/authentication.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Username/Password, but additional providers could be added (just submit a GitHub


### Setup instructions
The easiest way would be to use [docker-compose-with-auth.yml](https://github.com/keephq/keep/blob/main/docker-compose-with-auth.yaml) which populates the following environment variables:
The easiest way would be to use [docker-compose-with-auth.yml](https://github.com/keephq/keep/blob/main/docker-compose-with-auth.yml) which populates the following environment variables:

#### Backend
```
Expand Down
44 changes: 40 additions & 4 deletions docs/development/getting-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,44 @@ docker-compose -f docker-compose.dev.yml up
```

## VSCode
You can run Keep from your VSCode (after cloning the repo) by adding this configurations to your `launch.json`:
You can run Keep from your VSCode (after cloning the repo) by adding this configurations to your `.vscode/launch.json`:

```json
{
"version": "0.2.0",
"configurations": [
{
"name": "Keep Backend",
"type": "python",
"type": "debugpy",
"request": "launch",
"program": "keep/cli/cli.py",
"console": "integratedTerminal",
"justMyCode": false,
"args": ["--json", "api","--multi-tenant"],
"env": {"PYDEVD_DISABLE_FILE_VALIDATION": "1"}
"env": {
"PYDEVD_DISABLE_FILE_VALIDATION": "1",
"PYTHONPATH": "${workspaceFolder}/",
"PUSHER_APP_ID": "1",
"SECRET_MANAGER_DIRECTORY": "./state/",
"PUSHER_HOST": "localhost",
"PUSHER_PORT": "6001",
"PUSHER_APP_KEY": "keepappkey",
"PUSHER_APP_SECRET": "keepappsecret",
}
},
{
"name": "Keep Simulate Alerts",
"type": "debugpy",
"request": "launch",
"program": "scripts/simulate_alerts.py",
"console": "integratedTerminal",
"justMyCode": false,
"env": {
"PYDEVD_DISABLE_FILE_VALIDATION": "1",
"PYTHONPATH": "${workspaceFolder}/",
"KEEP_API_URL": "http://localhost:8080",
"KEEP_API_KEY": "some-api-key"
}
},
{
"name": "Keep Frontend",
Expand All @@ -41,9 +64,22 @@ You can run Keep from your VSCode (after cloning the repo) by adding this config
"cwd": "${workspaceFolder}/keep-ui",
}
]
}
}
```

Install dependencies:
```
pip install poetry'
poetry install;
cd keep-ui && npm i;
```

Launch Pusher ([soketi](https://soketi.app/)) container in parallel:
```bash
docker run -d -p 6001:6001 -p 9601:9601 -e SOKETI_USER_AUTHENTICATION_TIMEOUT=3000 -e SOKETI_DEFAULT_APP_KEY=keepappkey -e SOKETI_DEFAULT_APP_SECRET=keepappsecret -e SOKETI_DEFAULT_APP_ID=1 quay.io/soketi/soketi:1.4-16-debian
```


## VSCode + Docker
<Info>For this guide to work, the VSCode Docker extension is required.</Info>
<Tip>In air-gapped environments, you might consider building the container on an internet-connected computer, exporting the image using docker save, transferring it with docker load in the air-gapped environment, and then using the run configuration.</Tip>
Expand Down
8 changes: 8 additions & 0 deletions docs/generate_readme_from_openapijson.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

#!/bin/bash

# Before running this script, make sure you have update the openapi.json from the backend, (/docs route)

python3 openapi_converter.py --source ./openapi.json --dest ./openapi_converted.json
npx @mintlify/scraping@latest openapi-file ./openapi_converted.json -o ./api-ref
rm ./openapi_converted.json
1 change: 1 addition & 0 deletions docs/mint.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
"providers/documentation/mailchimp-provider",
"providers/documentation/mock-provider",
"providers/documentation/mysql-provider",
"providers/documentation/netdata-provider",
"providers/documentation/new-relic-provider",
"providers/documentation/ntfy-provider",
"providers/documentation/openshift-provider",
Expand Down
2 changes: 1 addition & 1 deletion docs/openapi.json

Large diffs are not rendered by default.

Loading

0 comments on commit acd3373

Please sign in to comment.