Merge branch 'main' into main

Author: MaedahBatool

docs/admin/deploy/docker-single-container/index.mdx

@@ -138,6 +138,11 @@ SELECT * FROM users;
 
 ## Upgrade
 
+> Warning: The 5.11 release updates the database container images from Postgres 12 to Postgres 16. Customers are advised to have a database backup before upgrading! See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice!
+>
+> Single-container *does not* support auto migration to postgres 16. If you are planning to upgrade to 5.11.0 and beyond on single-container, you will need to dump the postgres databases and restore them after the upgrade.
+> In this event, we highly recommend you migrate to a production supported deployment method, or switch to our cloud offering.
+
 ### Standard upgrades
 
 A [standard upgrade](/admin/updates/#standard-upgrades) occurs between two minor versions of Sourcegraph. If you are looking to jump forward several versions, you must perform a [multi-version upgrade](#multi-version-upgrades) instead.

docs/admin/deploy/kubernetes/index.mdx

@@ -103,6 +103,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ---
 apiVersion: v1
 kind: Secret
@@ -115,6 +116,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ---
 apiVersion: v1
 kind: Secret
@@ -127,6 +129,7 @@ data:
   password: ""
   port: ""
   user: ""
+  pgsslmode: "require" # optional, enable if using SSL
 ```
 
 The above Secrets should be deployed to the same namespace as the existing Sourcegraph deployment.
@@ -163,6 +166,7 @@ pgsql:
     user: "new-user"
     password: "new-password"
     port: "5432"
+    pgsslmode: "require" # optional, enable if using SSL
 ```
 
 #### Using external Redis instances

docs/admin/executors/executors_troubleshooting.mdx

@@ -242,3 +242,22 @@ Tells us that the Pod cannot be scheduled because the pod affinity rules (`EXECU
 configured do not match any nodes.
 
 In this case, the `EXECUTOR_KUBERNETES_POD_AFFINITY` needs to be modified to correctly target the node.
+
+### Executor Job failure issues
+
+If you see below errors for executor jobs:
+
+Codeintel
+```Index failed to index: Running command "step.kubernetes.pre-index.0": job sg-executor-job-codeintel-111877 failed: Usage of EmptyDir volume "job-data" exceeds the limit "5Gi".```
+
+Batch Changes
+```"step.kubernetes.step.0.pre": job sg-executor-job-batches-91562 failed: Usage of EmptyDir volume "job-data" exceeds the limit "5Gi".```
+
+Update the below variables in the respective executor's deployment file to increase EmptyDir volume "job-data" storage. In this example, ```KUBERNETES_JOB_VOLUME_SIZE``` is set to 20Gi, but you can tweak it as per your requirement.
+
+```
+- name: KUBERNETES_JOB_VOLUME_TYPE          value: emptyDir        
+- name: KUBERNETES_JOB_VOLUME_SIZE          value: 20Gi
+```
+
+```KUBERNETES_JOB_VOLUME_TYPE``` can be either set to ```emptyDir``` or ```pvc``` and if it’s not set, the default is ```emptyDir```

docs/admin/search.mdx

@@ -153,8 +153,8 @@ Shard merging can be fine-tuned by setting ENV variables for Zoekt indexserver:
 | ---------------------- | ---------------------------------------------------------------------------------------------- | -------- |
 | SRC_VACUUM_INTERVAL    | Run vacuum this often, specified as a duration                                                 | 24 hours |
 | SRC_MERGE_INTERVAL     | Run merge this often, specified as a duration                                                  | 8 hours  |
-| SRC_MERGE_TARGET_SIZE  | The target size of compound shards in MiB                                                      | 2000     |
-| SRC_MERGE_MIN_SIZE     | The minimum size of a compound shard in MiB                                                    | 1800     |
+| SRC_MERGE_TARGET_SIZE  | The target size of compound shards in MiB                                                      | 1000     |
+| SRC_MERGE_MIN_SIZE     | The minimum size of a compound shard in MiB                                                    | 800      |
 | SRC_MERGE_MIN_AGE      | The time since the last commit in days. Shards with newer commits are excluded from merging.   | 7        |
 
 When repostiories receive udpates, Zoekt reindexes them and tombstones their old index data. As a result, compound shards can shrink and be dismantled into individual shards once they reach a critical minimum size. These individual

docs/admin/workers.mdx

@@ -62,7 +62,7 @@ This job periodically compares index records against retention policies and mark
 
 #### `codeintel-package-filter-applicator`
 
-This job periodically updates the blocked status of package repo references and versions when package repo fitlers are updated or deleted.
+This job periodically updates the blocked status of package repo references and versions when package repo filters are updated or deleted.
 
 #### `insights-job`
 

docs/batch-changes/update-a-batch-change.mdx

@@ -60,6 +60,7 @@ Here are some examples:
 - When the [`changesetTemplate.title`](/batch-changes/batch-spec-yaml-reference#changesettemplatetitle) or the [`changesetTemplate.body`](/batch-changes/batch-spec-yaml-reference#changesettemplatecommitauthor) are changed and the changeset has been published, the changeset on the code host will be updated accordingly
 - When the [`changesetTemplate.branch`](/batch-changes/batch-spec-yaml-reference#changesettemplatetitle) is changed after the changeset has been published on the code host, the existing changeset will be closed on the code host and the new one, with the new branch, will be created
 - When the batch spec is changed in such a way that no diff is produced in a repository in which the batch change has already created and published a changeset, the existing changeset will be closed on the code host and archived in the batch change
+- When the changeset has been published and the batch spec is changed in such a way that a commit on the code host will be overwritten, any commits that have been manually added to the changeset on the code host will be deleted 
 
 <Callout type="note">See the [Batch Changes design](/batch-changes/design) docs for more information on the declarative nature of the Batch Changes system.</Callout>
 

docs/code-search/code-navigation/how-to/adding_lsif_to_workflows.mdx renamed to docs/code-search/code-navigation/how-to/adding_scip_to_workflows.mdx

@@ -103,7 +103,7 @@ jobs:
 The following projects have example GitHub Action workflows to generate and upload indexes.
 
 - [elastic/kibana](https://github.com/sourcegraph-codeintel-showcase/kibana/blob/7ed559df0e2036487ae6d606e9ffa29d90d49e38/.github/workflows/lsif.yml)
-- [golang/go](https://github.com/sourcegraph-codeintel-showcase/go/blob/f40606b1241b0ca4802d7b00a763241b03404eea/.github/workflows/lsif.yml)
+- [golang/go](https://github.com/sourcegraph-codeintel-showcase/go/blob/master/.github/workflows/scip.yml)
 - [kubernetes/kubernetes](https://github.com/sourcegraph-codeintel-showcase/kubernetes/blob/359b6469d85cc7cd4f6634e50651633eefeaea4e/.github/workflows/lsif.yml)
 - [lodash/lodash](https://github.com/sourcegraph-codeintel-showcase/lodash/blob/b90ea221bd1b1e036f2dfcd199a2327883f9451f/.github/workflows/lsif.yml)
 - [moby/moby](https://github.com/sourcegraph-codeintel-showcase/moby/blob/380429abb05846de773d5aa07de052f40c9e8208/.github/workflows/lsif.yml)

docs/code-search/features.mdx

@@ -65,7 +65,7 @@ The Sourcegraph search language supports [RE2](https://golang.org/s/re2syntax) s
 - It's well-supported in Go, allowing us to take advantage of a rich ecosystem (notably including [Zoekt](https://github.com/sourcegraph/zoekt))
 - Our API and tooling makes it straightforward to use Sourcegraph with other tools that provide facilities not built in to the search language.
 
-As an example of how you can use Sourcegraph tooling with other tools, we can use `jq` (which supports Perl regexes) along with `src` to post-filter search results. In this case, we want to use backreferences to find go functions take a single pointer argument and return a non-pointer of the same type as the input.
+As an example of how you can use Sourcegraph tooling with other tools, we can use `jq` (which supports Perl regexes) along with `src` to post-filter search results. In this case, we want to use backreferences to find go functions that take a single pointer argument and return a non-pointer of the same type as the input.
 
 ```shell
 re2_regex='func \w+\(\w+ \*\w+\) \w+'

docs/cody/clients/install-eclipse.mdx

@@ -74,3 +74,7 @@ When you have both a repository and files @-mentioned, Cody will search the repo
 ## Prompts
 
 Cody offers a variety of [pre-built prompts](/cody/capabilities/commands) to help you get the most out of your chat experience. You can access these prompts from the chat input field.
+
+## Feedback
+
+While Cody for Eclipse is currently in the experimental stage, we are open to feedback [in our forum](https://community.sourcegraph.com/c/cody/eclipse/13).

docs/cody/core-concepts/cody-gateway.mdx

@@ -8,7 +8,7 @@ Cody Gateway powers the default `"provider": "sourcegraph"` and Cody completions
 
 ## Supported Models
 
-For a full list of supported models and providers, read our [Supported LLMs] (/Cody/capabilities/supported-models) docs.
+For a full list of supported models and providers, read our [Supported LLMs](/Cody/capabilities/supported-models) docs.
 
 ## Setting up Cody Gateway in Sourcegraph Enterprise