Skip to content

Commit 041acb3

Browse files
topazteedavid1542
andauthored
rebranding (#30)
* rebranding * Change file name --------- Co-authored-by: david1542 <[email protected]>
1 parent deb2fb0 commit 041acb3

Some content is hidden

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

89 files changed

+935
-1107
lines changed

.env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ POSTGRES_CONNECTION_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgre
5656

5757
# MongoDB
5858
MONGO_PORT=27017
59-
MONGO_URI=mongodb://mongo:${MONGO_PORT}/merlinn-db
59+
MONGO_URI=mongodb://mongo:${MONGO_PORT}/vespper-db
6060

6161
# ChromaDB
6262
CHROMA_PORT=8000
@@ -130,4 +130,4 @@ PAGERDUTY_SECRET="put your secret"
130130

131131
# Log parser
132132
LOG_PARSER_PORT=3004
133-
LOG_PARSER_URL=${ENVOY_URL}/log-parser
133+
LOG_PARSER_URL=${ENVOY_URL}/log-parser

.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ data
1717
*.launch
1818
.settings/
1919
*.sublime-workspace
20-
merlinn.iml
20+
vespper.iml
2121

2222
# IDE - VSCode
2323
.vscode/*
@@ -55,5 +55,5 @@ config/litellm/.env
5555
.terraform.tfstate.lock.info
5656
terraform.tfstate
5757
terraform.tfstate.backup
58-
merlinn-aws
59-
merlinn-aws.pub
58+
vespper-aws
59+
vespper-aws.pub

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Here’s how you can help out:
1010

1111
This guide will walk you through our development process, where to get help and other handy resources. We want to make it easy for you to get involved, whether it’s updating our docs, improving the app, or fixing some bugs.
1212

13-
Got questions? We are hanging out on [Slack](https://join.slack.com/t/merlinncommunity/signup), ready to help.
13+
Got questions? We are hanging out on [Slack](https://join.slack.com/t/vesppercommunity/signup), ready to help.
1414

1515
If you’re short on time for coding, no worries! You can still support Merlinn in other ways:
1616

@@ -123,7 +123,7 @@ Additionally, if you want to work on our Python services (currently only the `da
123123
```bash
124124
yarn install
125125
```
126-
2. Create a `.env` file as described in the [quickstart guide](https://github.com/merlinn-co/merlinn?tab=readme-ov-file#quick-installation-%EF%B8%8F).
126+
2. Create a `.env` file as described in the [quickstart guide](https://github.com/vespper/vespper?tab=readme-ov-file#quick-installation-%EF%B8%8F).
127127
3. Run the infrastructure services using docker:
128128
```bash
129129
docker compose --profile infra up

README.md

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
# Merlinn - open-source AI on-call developer
22

33
<div align="center">
4-
<a href="https://merlinn.co">
4+
<a href="https://vespper.co">
55
<img src="./assets/logo-wizard.jpg" alt="Merlinn-logo" width="30%"/>
66
</a>
77
</div>
88
<br />
99
<div align="center">
1010
<div>
11-
<a href="https://docs.merlinn.co"><strong>Docs</strong></a> ·
11+
<a href="https://docs.vespper.com"><strong>Docs</strong></a> ·
1212
<a href="https://www.loom.com/share/85dc64d021cc40c4b1064389c20782a6?sid=91b063df-8111-40f0-9ea4-793d5fbe3f6f"><strong>Demo</strong></a> ·
13-
<a href="https://github.com/merlinn-co/merlinn/issues"><strong>Report Bug</strong></a> ·
14-
<a href="https://github.com/orgs/merlinn-co/discussions"><strong>Feature Request</strong></a> ·
15-
<a href="https://merlinn.co/blog"><strong>Blog</strong></a> ·
16-
<a href="https://join.slack.com/t/merlinncommunity/signup"><strong>Slack</strong></a>
13+
<a href="https://github.com/vespper/vespper/issues"><strong>Report Bug</strong></a> ·
14+
<a href="https://github.com/orgs/vespper/discussions"><strong>Feature Request</strong></a> ·
15+
<a href="https://vespper.com/blog"><strong>Blog</strong></a> ·
16+
<a href="https://join.slack.com/t/vesppercommunity/signup"><strong>Slack</strong></a>
1717
</div>
1818
</div>
1919
<br />
2020
<div style="display: flex" style="margin-bottom: 20px">
21-
<a href="https://merlinn.co/?utm_source=github"><img src="https://img.shields.io/badge/Website-blue?logo=googlechrome&logoColor=orange"/></a>
22-
<a href="https://calendly.com/dudu-merlinn/45-minute-meeting"><img src="https://img.shields.io/badge/Book%20a%20Call-blue" /></a>
23-
<a href="https://github.com/merlinn-co/merlinn/blob/main/LICENSE.md"><img src="https://img.shields.io/badge/License-Apache 2.0-red.svg?style=flat-square" alt="Apache 2.0 License"></a>
24-
<a href="https://github.com/merlinn-co/merlinn/actions/workflows/ci.yml/badge.svg?branch=main">
25-
<img src="https://github.com/merlinn-co/merlinn/actions/workflows/ci.yml/badge.svg?branch=main" alt="main-workflow">
21+
<a href="https://vespper.com/?utm_source=github"><img src="https://img.shields.io/badge/Website-blue?logo=googlechrome&logoColor=orange"/></a>
22+
<a href="https://calendly.com/dudu-vespper/45-minute-meeting"><img src="https://img.shields.io/badge/Book%20a%20Call-blue" /></a>
23+
<a href="https://github.com/vespper/vespper/blob/main/LICENSE.md"><img src="https://img.shields.io/badge/License-Apache 2.0-red.svg?style=flat-square" alt="Apache 2.0 License"></a>
24+
<a href="https://github.com/vespper/vespper/actions/workflows/ci.yml/badge.svg?branch=main">
25+
<img src="https://github.com/vespper/vespper/actions/workflows/ci.yml/badge.svg?branch=main" alt="main-workflow">
2626
</a>
2727
<a href="https://github.com/prettier/prettier">
2828
<img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square" alt="code style: prettier">
2929
</a>
30-
<a href="https://join.slack.com/t/merlinncommunity/signup">
31-
<img src="https://img.shields.io/badge/slack-merlinn-E01E5A.svg?logo=slack" alt="slack-logo" />
30+
<a href="https://join.slack.com/t/vesppercommunity/signup">
31+
<img src="https://img.shields.io/badge/slack-vespper-E01E5A.svg?logo=slack" alt="slack-logo" />
3232
</a>
3333
</div>
3434

@@ -49,11 +49,11 @@ Most people don't like to do on-call shifts. It requires engineers to be swift a
4949
- [Getting started](#getting-started-)
5050
- [Prerequisites](#prerequisites-)
5151
- [Quick Installation](#quick-installation-)
52-
- [Updating Merlinn](#updating-merlinn-️-)
52+
- [Updating Merlinn](#updating-vespper-️-)
5353
- [Deployment](#deployment-)
5454
- [Visualize Knowledge Base](#visualize-knowledge-base-)
5555
- [Support and feedback](#support-and-feedback-️)
56-
- [Contributing to Merlinn](#contributing-to-merlinn-️)
56+
- [Contributing to Merlinn](#contributing-to-vespper-️)
5757
- [Troubleshooting](#troubleshooting-️)
5858
- [Telemetry](#telemetry-)
5959
- [License](#license-)
@@ -91,7 +91,7 @@ You can find the installation video [here](https://www.loom.com/share/1f562cb067
9191
1. Clone the repository:
9292

9393
```bash
94-
git clone [email protected]:merlinn-co/merlinn.git && cd merlinn
94+
git clone [email protected]:vespper/vespper.git && cd vespper
9595
```
9696

9797
2. Configure LiteLLM Proxy Server:
@@ -121,7 +121,7 @@ You can find the installation video [here](https://www.loom.com/share/1f562cb067
121121
122122
5. Update these variables:
123123
124-
- `SLACK_BOT_TOKEN`, `SLACK_APP_TOKEN` and `SLACK_SIGNING_SECRET` - These variables are needed in order to talk to Merlinn on Slack. Please follow [this guide](https://github.com/merlinn-co/merlinn/tree/main/config/slack/README.md) to create a new Slack app in your organization.
124+
- `SLACK_BOT_TOKEN`, `SLACK_APP_TOKEN` and `SLACK_SIGNING_SECRET` - These variables are needed in order to talk to Merlinn on Slack. Please follow [this guide](https://github.com/vespper/vespper/tree/main/config/slack/README.md) to create a new Slack app in your organization.
125125
126126
- (Optional) `SMTP_CONNECTION_URL` - This variable is needed in order to invite new members to your Merlinn organization via email and allow them to use the bot. It's not mandatory if you just want to test Merlinn and play with it. If you do want to send invites to your team members, you can use a service like SendGrid/Mailgun. Should follow this pattern: `smtp://username:password@domain:port`.
127127

@@ -133,25 +133,25 @@ You can find the installation video [here](https://www.loom.com/share/1f562cb067
133133
That's it. You should be able to visit Merlinn's dashboard in http://localhost:5173.
134134
Simply create a user **(with the same e-mail as the one in your Slack user)** and start to configure your organization. If something does not work for you, please checkout our [troubleshooting](#troubleshooting-️) or reach out to us via our [support channels](#support-and-feedback-️).
135135

136-
The next steps are to configure your organization a bit more (connect incident management tools, build a knowledge base, etc). Head over to the [connect & configure](https://docs.merlinn.co/Getting%20started/Configure%20&%20connect) section in our docs for more information 💫
136+
The next steps are to configure your organization a bit more (connect incident management tools, build a knowledge base, etc). Head over to the [connect & configure](https://docs.vespper.com/Getting%20started/Configure%20&%20connect) section in our docs for more information 💫
137137

138138
#### Using DockerHub images
139139

140-
If you want, you can pull our [Docker images](https://hub.docker.com/u/merlinnco) from DockerHub instead of cloning the repo & building from scratch.
140+
If you want, you can pull our [Docker images](https://hub.docker.com/u/vespper) from DockerHub instead of cloning the repo & building from scratch.
141141

142142
In order to do that, follow these steps:
143143

144144
1. Download configuration files:
145145

146146
```bash
147-
curl https://raw.githubusercontent.com/merlinn-co/merlinn/main/tools/scripts/download_env_files.sh | sh
147+
curl https://raw.githubusercontent.com/vespper/vespper/main/tools/scripts/download_env_files.sh | sh
148148
```
149149

150150
2. Follow steps 2 and 5 above to configure LiteLLM Proxy and your `.env` file respectively. Namely, you'd need to configure your OpenAI key at `config/litellm/.env` and configure your Slack credentials in the root `.env`.
151151
152152
3. Spin up the environment using docker compose:
153153
```bash
154-
curl https://raw.githubusercontent.com/merlinn-co/merlinn/main/tools/scripts/start.sh | sh
154+
curl https://raw.githubusercontent.com/vespper/vespper/main/tools/scripts/start.sh | sh
155155
```
156156
157157
That's it 💫 You should be able to visit Merlinn's dashboard in http://localhost:5173.
@@ -172,7 +172,7 @@ That's it 💫 You should be able to visit Merlinn's dashboard in http://localho
172172
173173
### Deployment ☁️
174174
175-
Visit our [example guides](https://github.com/merlinn-co/merlinn/tree/main/examples) in order to deploy Merlinn to your cloud.
175+
Visit our [example guides](https://github.com/vespper/vespper/tree/main/examples) in order to deploy Merlinn to your cloud.
176176
177177
### Visualize Knowledge Base 🗺️
178178
@@ -193,16 +193,16 @@ To learn how to use VectorAdmin, visit the [docs](https://github.com/Mintplex-La
193193
In order of preference the best way to communicate with us:
194194
195195
- **GitHub Discussions**: Contribute ideas, support requests and report bugs (preferred as there is a static & permanent for other community members).
196-
- **Slack**: community support. Click [here](https://merlinn.co/#community) to join.
197-
- **Privately**: contact at support@merlinn.co
196+
- **Slack**: community support. Click [here](https://vespper.com/#community) to join.
197+
- **Privately**: contact at support@vespper.com
198198
199199
## Contributing to Merlinn ⛑️
200200
201-
If you're interested in contributing to Merlinn, checkout our [`CONTRIBUTING.md`](https://github.com/merlinn-co/merlinn/blob/main/CONTRIBUTING.md) file 💫 🧙‍♂️
201+
If you're interested in contributing to Merlinn, checkout our [`CONTRIBUTING.md`](https://github.com/vespper/vespper/blob/main/CONTRIBUTING.md) file 💫 🧙‍♂️
202202

203203
## Troubleshooting ⚒️
204204

205-
If you encounter any problems/errors/issues with Merlinn, checkout our [troubleshooting guide](https://github.com/merlinn-co/merlinn/tree/main/TROUBLESHOOTING.md). We try to update it regularly, and fix some of the urgent problems there as soon as possible.
205+
If you encounter any problems/errors/issues with Merlinn, checkout our [troubleshooting guide](https://github.com/vespper/vespper/tree/main/TROUBLESHOOTING.md). We try to update it regularly, and fix some of the urgent problems there as soon as possible.
206206

207207
Moreover, feel free to reach out to us at our [support channels](#support-and-feedback-️).
208208

@@ -215,17 +215,17 @@ This allows us to:
215215
- Understand how Merlinn is used so we can improve it.
216216
- Track overall usage for internal purposes and external reporting, such as for fundraising.
217217

218-
Rest assured, the data collected is not shared with third parties and does not include any sensitive information. We aim to be transparent, and you can review the specific data we collect [here](https://github.com/merlinn-co/merlinn/blob/main/services/api/src/telemetry/listener.ts).
218+
Rest assured, the data collected is not shared with third parties and does not include any sensitive information. We aim to be transparent, and you can review the specific data we collect [here](https://github.com/vespper/vespper/blob/main/services/api/src/telemetry/listener.ts).
219219

220220
If you prefer not to participate, you can easily opt-out by setting `TELEMETRY_ENABLED=false` inside your `.env`.
221221

222222
## License 📃
223223

224-
This project is licensed under the Apache 2.0 license - see the [LICENSE](https://github.com/merlinn-co/merlinn/tree/main/LICENSE.md) file for details
224+
This project is licensed under the Apache 2.0 license - see the [LICENSE](https://github.com/vespper/vespper/tree/main/LICENSE.md) file for details
225225

226226
## Learn more 🔍
227227

228-
Check out the official website at https://merlinn.co for more information.
228+
Check out the official website at https://vespper.com for more information.
229229

230230
## Contributors ✨
231231

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
We strongly recommend using the latest version of Merlinn to receive all security updates.
22

3-
For more information, please refer to our [Data Security & Privacy](https://docs.merlinn.co/Data%20Privacy%20&%20Security) page in the documentation or contact security@merlinn.com.
3+
For more information, please refer to our [Data Security & Privacy](https://docs.vespper.com/Data%20Privacy%20&%20Security) page in the documentation or contact security@vespper.comm.

TROUBLESHOOTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Troubleshooting Merlinn
22

33
In this document, you can find common scenarios where we're currently have problems. If you're interested in some of these
4-
issues and want to help, feel free to create an [issue](https://github.com/merlinn-co/merlinn/issues).
4+
issues and want to help, feel free to create an [issue](https://github.com/vespper/vespper/issues).
55

66
### `service "X" can't be used with extends as it declare depends_on`
77

@@ -18,7 +18,7 @@ Once your `.env` is updated, restart your containers using `docker compose up -d
1818

1919
This is not an error, but a scenario where you cannot send messages to Merlinn. It usually means you didn't enable the messages capability. Go to "App Home" and enable "Messages Tab" and "Allow users to send Slash commands and messages from the messages tab".
2020

21-
More information can be found in the [Slack guide](https://github.com/merlinn-co/merlinn/tree/main/config/slack).
21+
More information can be found in the [Slack guide](https://github.com/vespper/vespper/tree/main/config/slack).
2222

2323
### `An API error occured: invalid_auth`
2424

config/litellm/config.example.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
### LLM Setup file ####
33
#########################
44

5-
# In order to use merlinn, you need to provide 2 models: chat model and an embedding model. Our Opensource version supports OpenAI's models.
5+
# In order to use vespper, you need to provide 2 models: chat model and an embedding model. Our Opensource version supports OpenAI's models.
66
# You must keep the naming convention of the model_list as it is. Namely, model_name: chat-model and model_name: embedding-model
77

88
model_list:

config/slack/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ Once the app is installed, continue to the next section where you'll extract som
3333
In this section, you will configure some more things and extract these 3 variables: `SLACK_SIGNING_SECRET`, `SLACK_APP_TOKEN` and `SLACK_BOT_TOKEN`. They are needed in order for Merlinn's services to interact with your workspace.
3434

3535
1. In the "Basic Information" page, copy the “Signing Secret” from the Slack app settings and paste it into the .env file as `SLACK_SIGNING_SECRET`.
36-
2. In the same page "Basic Information", go to "App-Level Tokens" and click "Generate Token and Scopes". Give it a meaningful name (e.g merlinn-token) and grant it 2 scopes: `connections:write` and `authorizations:read`. Copy the token and put it in the main `.env` as `SLACK_APP_TOKEN`.
36+
2. In the same page "Basic Information", go to "App-Level Tokens" and click "Generate Token and Scopes". Give it a meaningful name (e.g vespper-token) and grant it 2 scopes: `connections:write` and `authorizations:read`. Copy the token and put it in the main `.env` as `SLACK_APP_TOKEN`.
3737
3. In the "OAuth & Permissions", copy the “Bot User OAuth Token” and put it in the main `.env` as `SLACK_BOT_TOKEN`.
3838
4. Go to "App Home" and enable "Messages Tab" and "Allow users to send Slash commands and messages from the messages tab".
3939

4040
### **(Optional)** Customize the Slack app
4141

4242
1. You can change the name and background color of the Slackbot in the Slack app settings.
43-
2. You can use Merlinn's logo as your app's logo. View the logo [here](https://storage.googleapis.com/merlinn-assets/brand/logo-wizard-full.jpg).
43+
2. You can use Merlinn's logo as your app's logo. View the logo [here](https://storage.googleapis.com/vespper-assets/brand/vespper-cat.png).
4444

4545
### Test the Slack app
4646

47-
To test the app, you should launch the slackbot & project. Go back to the [readme](https://github.com/merlinn-co/merlinn?tab=readme-ov-file#quick-installation-%EF%B8%8F) and go to step 6 ("launch the project").
47+
To test the app, you should launch the slackbot & project. Go back to the [readme](https://github.com/vespper/vespper?tab=readme-ov-file#quick-installation-%EF%B8%8F) and go to step 6 ("launch the project").
4848

4949
After you launch it, follow these steps to test the Slack app:
5050

5151
1. Go to your Slack workspace and go to Merlinn's direct messages.
52-
2. Write `/merlinn help` in the message bar.
52+
2. Write `/vespper help` in the message bar.
5353

5454
Now you should see the help message of the bot! 🥳
5555
This means the basic functionality works.
5656

5757
## Next Steps
5858

59-
If you were redirected to this guide from the main README.md, please continue to setup your environment [there](https://github.com/merlinn-co/merlinn?tab=readme-ov-file#quick-installation-%EF%B8%8F).
59+
If you were redirected to this guide from the main README.md, please continue to setup your environment [there](https://github.com/vespper/vespper?tab=readme-ov-file#quick-installation-%EF%B8%8F).
6060

61-
Also, you can visit our [docs](https://docs.merlinn.co/) for more information.
61+
Also, you can visit our [docs](https://docs.vespper.com/) for more information.

config/slack/manifest.self-hosted.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ features:
77
display_name: Merlinn
88
always_online: false
99
slash_commands:
10-
- command: /merlinn
10+
- command: /vespper
1111
description: Manage Merlinn
1212
should_escape: false
1313
oauth_config:

docker-compose.images.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,24 @@ services:
4949
extends:
5050
file: docker-compose.common.yml
5151
service: api-common
52-
image: merlinnco/api:latest
52+
image: vespper/api:latest
5353
slackbot:
5454
extends:
5555
file: docker-compose.common.yml
5656
service: slackbot-common
57-
image: merlinnco/slackbot:latest
57+
image: vespper/slackbot:latest
5858
data-processor:
5959
extends:
6060
file: docker-compose.common.yml
6161
service: data-processor-common
62-
image: merlinnco/data-processor:latest
62+
image: vespper/data-processor:latest
6363
log-parser:
6464
extends:
6565
file: docker-compose.common.yml
6666
service: log-parser-common
67-
image: merlinnco/log-parser:latest
67+
image: vespper/log-parser:latest
6868
dashboard:
6969
extends:
7070
file: docker-compose.common.yml
7171
service: dashboard-common
72-
image: merlinnco/dashboard:latest
72+
image: vespper/dashboard:latest

examples/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ In this directory, you can find several examples on how to work with Merlinn.
66

77
| Section | Description |
88
| :---------------------------------------------------------------------------------- | :---------------------------------------: |
9-
| [Deployments](https://github.com/merlinn-co/merlinn/tree/main/examples/deployments) | Learn how to deploy Merlinn to your cloud |
9+
| [Deployments](https://github.com/vespper/vespper/tree/main/examples/deployments) | Learn how to deploy Merlinn to your cloud |

0 commit comments

Comments
 (0)