Skip to content

Commit 02d1ecf

Browse files
authored
Merge branch 'main' into hackathon-faq
2 parents 42cd08f + b4e1c8b commit 02d1ecf

File tree

14 files changed

+162
-92
lines changed

14 files changed

+162
-92
lines changed

docs/admin/config/private-network.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ A **private network** refers to a secure network environment segregated from the
44
When deploying self-hosted Sourcegraph instances in private networks with specific compliance and policy requirements, additional configuration may be required to ensure all networking features function correctly. The reasons for applying the following configuration options depend on the specific functionality of the Sourcegraph service and the unique network and infrastructure requirements of the organization.
55

66
The following is a list of Sourcegraph services and how and when each initiates outbound connections to external services:
7+
- **executor**: Sourcegraph [Executor](../executors) batch change or precise indexing jobs may need to connect to services hosted within an organization's private network
78
- **frontend**: The frontend service communicates externally when connecting to external [auth providers](../auth), sending [telemetry data](../pings), testing code host connections, and connecting to [externally hosted](../external_services) Sourcegraph services
89
- **gitserver**: Executes git commands against externally hosted [code hosts](../external_service)
9-
- **repo-updater**: Communicates with [code hosts](../external_service) APIs to coordinate repository synchronization
1010
- **migrator**: Connects to Postgres instances (which may be [externally hosted](../external_services/postgres)) to process database migrations
11-
- **executor**: Sourcegraph [Executor](../executors) batch change or precise indexing jobs may need to connect to services hosted within an organization's private network
11+
- **repo-updater**: Communicates with [code hosts](../external_service) APIs to coordinate repository synchronization
12+
- **worker**: Sourcegraph [Worker](../workers) run various background jobs that may require establishing connections to services hosted within an organization's private network
1213

1314
## HTTP proxy configuration
1415
All Sourcegraph services respect the conventional `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variables for routing Sourcegraph client application HTTP traffic through a proxy server. The steps for configuring proxy environment variables will depend on your Sourcegraph deployment method.
@@ -17,14 +18,14 @@ All Sourcegraph services respect the conventional `HTTP_PROXY`, `HTTPS_PROXY`, a
1718
Add the proxy environment variables to your Sourcegraph Helm chart [override file](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/values.yaml):
1819

1920
```yaml
20-
frontend|gitserver|repo-updater:
21+
executor|frontend|gitserver|migrator|repo-updater|worker:
2122
env:
2223
- name: HTTP_PROXY
2324
value: http://proxy.example.com:8080
2425
- name: HTTPS_PROXY
2526
value: http://proxy.example.com:8080
2627
- name: NO_PROXY
27-
value: "*.cluster.local,blobstore,codeinsights-db,codeintel-db,sourcegraph-frontend-internal,sourcegraph-frontend,github-proxy,gitserver,grafana,indexed-search-indexer,indexed-search,jaeger-query,pgsql,precise-code-intel-worker,prometheus,redis-cache,redis-store,repo-updater,searcher,symbols,syntect-server,worker-executors,worker"
28+
value: "blobstore,codeinsights-db,codeintel-db,sourcegraph-frontend-internal,sourcegraph-frontend,github-proxy,gitserver,grafana,indexed-search-indexer,indexed-search,jaeger-query,pgsql,precise-code-intel-worker,prometheus,redis-cache,redis-store,repo-updater,searcher,symbols,syntect-server,worker-executors,worker,cloud-sql-proxy,localhost,127.0.0.1,.svc,.svc.cluster.local,kubernetes.default.svc"
2829
```
2930
3031
<Callout type="warning">Failure to configure `NO_PROXY` correctly can cause the proxy configuration to interfere with local networking between internal Sourcegraph services.</Callout>

docs/admin/monorepo.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Some monorepos use a custom command for `git fetch` to speed up fetch. Sourcegra
2727

2828
## Statistics
2929

30-
You can help the Sourcegraph developers understand the scale of your monorepo by sharing some statistics with the team. The bash script [`git-stats`](https://github.com/sourcegraph/sourcegraph/blob/main/dev/git-stats) when run in your git repository will calculate these statistics.
30+
You can help the Sourcegraph developers understand the scale of your monorepo by sharing some statistics with the team. The bash script [`git-stats`](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/dev/git-stats) when run in your git repository will calculate these statistics.
3131

3232
Example output on the Sourcegraph repository:
3333

3434
``` shellsession
35-
$ wget https://github.com/sourcegraph/sourcegraph/raw/main/dev/git-stats
35+
$ wget https://github.com/sourcegraph/sourcegraph-public-snapshot/raw/main/dev/git-stats
3636
$ chmod +x git-stats
3737
$ ./git-stats
3838
725M . gitdir

docs/code-search/queries/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Clicking the (.*) toggle interprets all search patterns as regular expressions.
3838
| [`foo bar`](https://sourcegraph.com/search?q=context:global+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+foo+bar&patternType=regexp) | Search for the regexp `foo(.*?)bar`. Spaces between non-whitespace strings becomes `.*?` to create a fuzzy search |
3939
| [`foo\ bar`](https://sourcegraph.com/search?q=foo%5C+bar&patternType=regexp) or [`/foo bar/`](https://sourcegraph.com/search?q=/foo+bar/&patternType=regexp) | Search for the regexp `foo bar`. The `\` escapes the space and treats the space as part of the pattern. Use `/.../` to avoid escaping spaces |
4040
| [`foo\nbar`](https://sourcegraph.com/search?q=foo%5Cnbar&patternType=regexp) | Perform a multiline regexp search. `\n` is interpreted as a newline |
41-
| [`"foo bar"`](https://sourcegraph.com/search?q=%27foo+bar%27&patternType=regexp) | Match the string literal `"foo bar"`. Quotes interpret strings exactly, except that special characters like `"` and `\` may be escaped, and whitespace escape sequences like `\n` are interpreted normally |
41+
| [`"foo bar"`](https://sourcegraph.com/search?q=%22foo+bar%22&patternType=regexp) | Match the string `foo bar` exactly. The space between the terms is interpreted literally. The quotes are not matched. |
4242

4343
<Callout type="note">We support [RE2 syntax](https://golang.org/s/re2syntax). Matching is case-insensitive by default (toggle the `Aa` button to change).</Callout>
4444

docs/cody/capabilities/chat.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
You can **chat** with Cody to ask questions about your code, generate code, and edit code. By default, Cody has the context of your open file and entire repository, and you can use `@` to add context for specific files, symbols, remote repositories, or other non-code artifacts.
66

7-
You can do it from the **chat** panel of the supported editor extensions ([VS Code](/clients/install-vscode), [JetBrains](/clients/install-jetbrains), [Visual Studio](/clients/install-visual-studio)) or in the [web](/clients/cody-with-sourcegraph) app.
7+
You can do it from the **chat** panel of the supported editor extensions ([VS Code](/cody/clients/install-vscode), [JetBrains](/cody/clients/install-jetbrains), [Visual Studio](/cody/clients/install-visual-studio)) or in the [web](/cody/clients/cody-with-sourcegraph) app.
88

99
## Prerequisites
1010

docs/cody/capabilities/openctx.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66

77
[OpenCtx](https://openctx.org/) is an open standard for bringing contextual info about code into your dev tools. Cody Free and Pro users can use OpenCtx providers to fetch and use context from the following sources:
88

9-
- [Webpages](https://openctx.org/docs/providers/web) (via URL)
9+
- [Webpages (via URL)](https://openctx.org/docs/providers/web) (enabled in Cody by default)
1010
- [Jira tickets](https://openctx.org/docs/providers/jira)
1111
- [Linear issues](https://openctx.org/docs/providers/linear-issues)
1212
- [Notion pages](https://openctx.org/docs/providers/notion)
1313
- [Google Docs](https://openctx.org/docs/providers/google-docs)
14+
- [Slack](https://openctx.org/docs/providers/slack)
15+
- [Storybook](https://openctx.org/docs/providers/storybook)
1416
- [Sourcegraph code search](https://openctx.org/docs/providers/sourcegraph-search)
1517

1618
## Enable OpenCtx context providers

docs/cody/clients/cody-with-sourcegraph.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ The chat interface with your Code Search queries is operated per chat. You canno
2929

3030
## LLM Selection
3131

32-
Sourcegraph.com users with Cody **Free** and **Pro** can choose from a list of supported LLM models for a chat. Claude Sonnet 3.5 is the default LLM model, but users can select the LLM of their choice from the drop-down menu.
32+
Cody Free and Pro users can select multiple models. Enterprise users with the new [model configuration](/cody/clients/model-configuration) can use the LLM selection dropdown to choose a chat model.
3333

34-
![llm-select-web](https://storage.googleapis.com/sourcegraph-assets/Docs/llm-select-web-0724.jpg)
34+
You can read about these supported LLM models [here](/cody/capabilities/supported-models#chat-and-commands).
3535

36-
Users on an Enterprise Sourcegraph instance do not have the option to choose an LLM model. Their site admin will configure the default LLM model for chat. However, Enterprise users with the new [model configuration](/cody/clients/model-configuration) can use the LLM selection dropdown to choose a chat model.
36+
![LLM-models-for-cody-free](https://storage.googleapis.com/sourcegraph-assets/Docs/llm-dropdown-options-102024.png)
3737

3838
## Selecting Context with @-mentions
3939

docs/cody/clients/index.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Cody Clients
22

3-
<p className="subtitle">You can install and start using Cody in your favorite IDEs and with the Sourcegraph web app.</p>
3+
<p className="subtitle">There are multiple ways to use Cody: you can install its extension in your favorite IDEs, access it via the Sourcegraph web app, or use it through the Cody CLI.</p>
44

55
<ProductCards>
66
<ProductCard href="/cody/clients/install-vscode" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/vscode.svg" imgAlt="VS Code" title="Cody for VS Code" description="Install Cody's free extension for VS Code. " />
77
<ProductCard href="/cody/clients/install-jetbrains" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/jb_beam.svg" imgAlt="JetBrains" title="Cody for JetBrains" description="Install Cody's free extension for JetBrains." />
8+
<ProductCard href="/cody/clients/install-visual-studio" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/visual-studio-Product-Icon.svg" imgAlt="Visual Studio" title="Cody for Visual Studio (Experimental)" description="Install Cody's free extension for Visual Studio." />
89
<ProductCard href="/cody/clients/cody-with-sourcegraph" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/cody-logomark-default.svg" imgAlt="Cody Web" title="Cody for Web" description="Use Cody in the Sourcegraph web app." />
910
<ProductCard href="/cody/clients/install-cli" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/command-line-blue.svg" imgAlt="Cody CLI" title="Cody CLI" description="Run Cody from the command line." />
1011
<ProductCard href="/cody/clients/enable-cody-enterprise" imgSrc="https://sourcegraph.com/.assets/img/sourcegraph-mark.svg" imgAlt="Cody Enterprise" title="Cody Enterprise" description="Get in touch with our team to try Cody for Sourcegraph Enterprise." />

0 commit comments

Comments
 (0)