diff --git a/content/company-info-and-process/policies/acceptable-use-policy.md b/content/company-info-and-process/policies/acceptable-use-policy.md index bbf9e860ab80..1d49b0d17990 100644 --- a/content/company-info-and-process/policies/acceptable-use-policy.md +++ b/content/company-info-and-process/policies/acceptable-use-policy.md @@ -8,7 +8,7 @@ The purpose of this policy is to define the acceptable use of Sourcegraph’s In ## Background -While Sourcegraph’s resources are intended to be used for business purposes, users are allowed to make limited personal use of computers and email provided that such use does not negatively impact the organization. Such use is subject to this and all other organization security policies. +While Sourcegraph’s resources are intended to be used for business purposes, users are allowed to make limited personal use of computers provided that such use does not negatively impact the organization. Such use is subject to this and all other organization security policies. ## Scope @@ -17,7 +17,7 @@ This policy applies to all Sourcegraph employees and contractors (referred to in # Policy Sourcegraph’s resources are intended for legitimate business purposes. -Sourcegraph employees may make reasonable limited personal use of the organization's IT resources such as laptop and email provided that such use does not negatively impact the organization or interfere with their duties. +Sourcegraph users may make reasonable limited personal use of the organization's IT resources such as laptop and email provided that such use does not negatively impact the organization or interfere with their duties. Sourcegraph’s email accounts are the property of the organization and should be used for business purposes only. Users should send and receive personal email from a personal account. Users assume personal responsibility for appropriate use of such resources and agree to comply with this policy, other applicable policies, and all applicable laws and regulations. Our aim is to ensure IT resources are available and used for productive business purposes. To ensure our IT resources are used appropriately, safe and stable, users are prohibited from engaging in any activity with IT resources that may jeopardize or are contrary to appropriate use. In particular, the transmittal, retrieval, or storage of information that is inappropriate for the workplace is not permitted while at work or with organization resources. Prohibited use includes, but is not limited to, content that violates any law, involves nudity, violence, illegal drugs, sex, or gambling, or involves discriminatory, harassing, disturbing, obscene or pornographic material. In addition to these guidelines, users should use common sense and consideration for others in deciding which content is appropriate for the workplace. diff --git a/content/departments/cloud/technical-docs/index.md b/content/departments/cloud/technical-docs/index.md index bad954496b75..a4e946317631 100644 --- a/content/departments/cloud/technical-docs/index.md +++ b/content/departments/cloud/technical-docs/index.md @@ -17,7 +17,9 @@ The release process is performed in steps: 1. New version is released via [release team](../../engineering/teams/release/team/index.md) 2. GitHub issue in [Sourcegraph Customer repository](https://github.com/sourcegraph/customer) with the `mi2 env create-tracking-issue -e prod $TARGET_VERSION` command 3. GitHub issue is labeled with `team/cloud` and Cloud Team is automatically notified to perform Managed Instances upgrade. Label is part of the template. -4. Cloud team performs upgrade of all instances in given order: +4. Cloud team performs upgrade of all instances in given order depending on the release type: + +#### Release process for quarterly major release | Stage | Working days since release | Action | Condition not met? | | ----- | -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------- | @@ -34,7 +36,7 @@ Sample upgrade: - [tracking issue - 5.1.4](https://github.com/sourcegraph/customer/issues/2251). - GitHub Pull Requests for [5.1.4 upgrade](https://github.com/sourcegraph/cloud/pulls?q=is%3Apr+is%3Aclosed+label%3Ami-upgrade+5.1.4) -#### Release process for patch releases +#### Release process for monthly minor or patch releases With [bi-weekly patch release schedule](../../engineering/dev/process/releases/index.md#patch-schedule), Cloud Team is using simplified release process to ensure Cloud customers can obtain patch as soon as possible. diff --git a/content/departments/engineering/linear-trial.md b/content/departments/engineering/linear-trial.md new file mode 100644 index 000000000000..817985e910b0 --- /dev/null +++ b/content/departments/engineering/linear-trial.md @@ -0,0 +1,237 @@ +# Using Linear at Sourcegraph (trial) + + + +This document describes recommended ways of using Linear +during the trial period, without causing a disruption to +team members who continue using GitHub +and are not part of the trial. + +While the [Linear docs](https://linear.app/docs) are excellent, +here is a very quick run down of the core mental model. + +- The workspace is divided into Teams. + - Settings related to workflow (issue statuses, estimates, cycles), + templates (for issues, projects etc.), syncing with external tools + and so on are customizable per Team. +- **Issues** are the smallest unit of work. + - Issues can have sub-issues, be blocked by other issues etc. + - An Issue belongs to a single Team: the issue identifier includes + a short prefix based on the Team. (Example: ENG-123) +- **Views** allow slicing/dicing Issues in flexible ways. + - Views work both within Teams and across Teams. +- **Projects** allow grouping issues into more coherent units. + - A Project belongs to a single Team, but can contain issues + that belong to other Teams. + - Project can have Documents that allow inline comment threads + similar to Google Docs. +- **Roadmaps** allow grouping projects into larger units, + and are owned at the workspace level. + +For more details, see the [conceptual model docs](https://linear.app/docs/conceptual-model). + +## Logging in + +Install the [Linear app](https://linear.app/download) or +go to [our Linear workspace](https://linear.app/sourcegraph) +and log in with SAML SSO. + +## Team structure + +For now, we will aim to use coarse-grained teams. +To start out with, there are 5 teams: Eng PUBLIC, +Eng Private, Product, Design and Implementation. + +Teammates in other parts of the company interested +in testing out Linear should feel free to create new Teams. + +### Eng PUBLIC and Eng Private + +Eng PUBLIC has _full_ bidirectional syncing with `sourcegraph/sourcegraph`. +This means that the following will be synced across, +regardless of whether the change is made in Linear or GitHub: + +1. New issues being created. +2. Changes to labels, issue title, issue description, + new comments (for the "GitHub thread" in Linear), and + open/close status. + +All other repositories have _partial_ bidirectional syncing, +which means that out of (1) and (2) above, only (2) is enabled, +i.e. new issues created in Linear will not be synced to GitHub. +This applies to: + +- `sourcegraph/customer` - synced with Eng Private +- `sourcegraph/cody` +- `sourcegraph/src-cli` +- `sourcegraph/scip`, `sourcegraph/scip-java` and other indexers +- All other private repositories that have syncing turned on. + The full list of repos with syncing can be found [here](https://linear.app/sourcegraph/settings/integrations/github). + +Both Eng PUBLIC and Eng Private are configured to use [2 week cycles](https://linear.app/docs/use-cycles) +based on [RFC 916](https://docs.google.com/document/d/16mipKz0fc2Ki5NYXG8Rarb8b4KHh34t27P9Ao_m8e-o/edit). + +## Adding a new repository (for Engineering) + +You can ask for help in `#wg-linear-trial` with these steps as well. + +1. Add the repository to the [GitHub integration](https://linear.app/sourcegraph/settings/integrations/github). + If you do not see repositories in the Sourcegraph GitHub org listed here, + you may need to request the `sourcegraph - Owner` GitHub permission in Entitle. + + - For private repos, use the `Eng Private` team. + - For public repos, use the `Eng PUBLIC` team. + + DO NOT enable the "Enable bidirectional sync" toggle; + it only applies to _new issues_ created in Linear. + Comments, label changes, title and description changes will + still sync bidirectionally even if that toggle is disabled. + See the [FAQ](#faq) for more details. + +2. Under [Import / Export](https://linear.app/sourcegraph/settings/import-export), + add a GitHub repository. After clicking 'Connect to GitHub' there may + be a delay of 10-15s before you see the options for selecting a repo. + + If you do not see repositories in the Sourcegraph GitHub org listed here, + you may need to request the `sourcegraph - Owner` GitHub permission in Entitle. + + - If present, disable the toggle for importing data from organization level projects. + - Enable the toggle for importing data from closed issues. + - Select the team to import issues into: + - For private repos, use the `Eng Private` team. + - For public repos, use the `Eng PUBLIC` team. + + After importing is complete, you will have the option to configure it. + Make sure all these checkboxes are checked: + + - Import N open issues + - Import N stale issues to Archive + - Import N closed or done issues to Archive + - Sync issues after import + + So that syncing is maintained for old issues, and all issue history + is available for search. + + After this step, select 'Import users' and make sure that: + + - If a person has 'Map to Existing' but no associated account on + the right side, then change it to 'Do not create' + - Replace any 'Create with email' with 'Do not create' + + Once you click next, confirm on the next page that: + + - The number of user invites is zero + - The number of completed issues matches up with the closed + issues in the repo's GitHub issue tracker. + +At the moment, all repos except for the monorepo use an extra issue label +to allow filtering for views inside Linear. For example, the `scip-java` +repo uses the `graph/scip-java` label. +Here is an [example PR](https://github.com/sourcegraph/scip-java/pull/685/files) +for auto-adding the label to new issues. +For old issues, you can quickly add the label after importing into Linear. + +## Dos and Don'ts + +1. **Don't create new Teams for sub-teams in Engineering** + (except for testing Linear features, that's OK). + Instead, let's try to tweak existing settings or enable new ones + which would be useful to all teams. +2. **Do add other repositories of interest to Linear**. + - Even for repos which only have PRs, if the PR descriptions + use Linear identifiers such as `Fixes ENG-123`, + then the corresponding issue will be auto-closed. + - Caveat: Do not enable bidirectional syncing for other repos + in Eng PUBLIC or Eng Private. +3. If your team is on-board, **do connect your team's #discuss + channel with Eng Private using Linear Asks** + ([here](https://linear.app/sourcegraph/settings/asks)) + to easily turn Slack threads into issues. ([docs](https://linear.app/docs/linear-asks)) +4. **Avoid creating new label groups inside Linear** + (creating new labels, is OK). - If you attempt to create a new label with `/` on-the-fly + when editing an issue, Linear will create a label group + instead of a "flat" label. + + For example, if you type `X/Y` for a new label, it will create + a group `X` with a label `Y` in that group. Since `X` is the + group name, the label synced to GitHub will be just `Y`. + This may be confusing to someone seeing the issue on GitHub + as the prefix is no longer available. + + - Label groups also have at-most-one semantics - you can't apply + multiple labels from the same group to a single issue. + - Alternative: you can create a label with `/` from the Team's settings + ([example link](https://linear.app/sourcegraph/settings/teams/ENG/labels)). + +5. **Do explore the various Linear [features](https://linear.app/docs) + and [integrations](https://linear.app/sourcegraph/settings/integrations)**. + +## FAQ + +### Why are Eng PUBLIC and Eng Private separate? + +The Eng Private team is present because of the following +considerations: + +1. We have some private repositories on GitHub. +2. We'd like to use bidirectional syncing for the trial + period to avoid disrupting people not using Linear. +3. To test out whether Linear can work well as a single + pane of glass for issues, we need to sync issues from + our private repos into Linear. +4. The Linear -> GitHub sync direction uses the default + repo set in the GitHub integration, instead of offering + a repo picker. +5. The default repo for Eng PUBLIC is sourcegraph/sourcegraph + for ease of use. + +The above factors create the risk of an information leak +if someone creates an issue in Linear with customer details. + +Eng Private also provides a natural place to create issues +from Slack threads which may have customer details. + +### Why not create separate Linear Teams for each sub-team in Engineering? + +We initially considered doing this but decided against it +for the following reasons: + +- It would create a proliferation of issue prefixes in identifiers, + making it harder to identify the top-level team based on the identifier. +- If there were any re-orgs in the future, having the issue identifiers + change to reflect new team names would be a disorienting experience, + especially for teammates outside Engineering. +- For teammates outside Engineering, it would be valuable to reduce + the number of potential places to file issues. + +However, if the flexibility provided by the current team structure +is not enough, then we can consider creating smaller Teams in Linear +at the end of the trial (around mid May). + +### Why don't we have full bidirectional syncing for all repos? + +This limitation is present because Linear doesn't offer a repo picker +in the UI if bidirectional issue creation syncing is +enabled for more than 1 repo. + +This means that even if we enabled +bidirectional syncing for say `sourcegraph/cody` with the Eng PUBLIC +Team, you couldn't actually create issues which sync to that repo directly +in the UI. To have that work, we'd have to create a separate Cody Team +in Linear with `sourcegraph/cody` being it's default bidirectional syncing repo. + +However, that would defeat the above goal of avoiding creating +separate Linear Teams for each sub-team in Engineering. + +## Known restrictions + +- No custom fields for Issues. +- An issue can have at most one assignee (DRI model). diff --git a/content/departments/engineering/managed-services/build-tracker.md b/content/departments/engineering/managed-services/build-tracker.md index ced896a20812..2ceb9249dd38 100644 --- a/content/departments/engineering/managed-services/build-tracker.md +++ b/content/departments/engineering/managed-services/build-tracker.md @@ -3,8 +3,8 @@ This document describes operational guidance for Build Tracker infrastructure. diff --git a/content/departments/engineering/managed-services/cloud-ops.md b/content/departments/engineering/managed-services/cloud-ops.md index b780a07b58be..35708acbf9b1 100644 --- a/content/departments/engineering/managed-services/cloud-ops.md +++ b/content/departments/engineering/managed-services/cloud-ops.md @@ -3,8 +3,8 @@ This document describes operational guidance for Cloud Ops Dashboard infrastructure. @@ -22,7 +22,7 @@ If you need assistance with MSP infrastructure, reach out to the [Core Services] | Service ID | `cloud-ops` ([specification](https://github.com/sourcegraph/managed-services/blob/main/services/cloud-ops/service.yaml)) | | Owners | **cloud** | | Service kind | Cloud Run service | -| Environments | [prod](#prod) | +| Environments | [prod](#prod), [dev](#dev) | | Docker image | `us-central1-docker.pkg.dev/control-plane-5e9ee072/docker/apiserver` | | Source code | [`github.com/sourcegraph/controller` - `cmd/apiserver`](https://github.com/sourcegraph/controller/tree/HEAD/cmd/apiserver) | @@ -98,3 +98,74 @@ The Terraform Cloud workspaces for this service environment are [grouped under t ```bash sg msp tfc view cloud-ops prod ``` + +### dev + +| PROPERTY | DETAILS | +| ------------------- | ------------------------------------------------------------------------------------------------- | +| Project ID | [`cloud-ops-dev-caff`](https://console.cloud.google.com/run?project=cloud-ops-dev-caff) | +| Category | **internal** | +| Deployment type | `subscription` | +| Resources | [dev Redis](#dev-redis) | +| Slack notifications | [#alerts-cloud-ops-dev](https://sourcegraph.slack.com/archives/alerts-cloud-ops-dev) | +| Alerts | [GCP monitoring](https://console.cloud.google.com/monitoring/alerting?project=cloud-ops-dev-caff) | +| Errors | [Sentry `cloud-ops-dev`](https://sourcegraph.sentry.io/projects/cloud-ops-dev/) | +| Domain | [cloud-ops-dev.sgdev.org](https://cloud-ops-dev.sgdev.org) | +| Cloudflare WAF | ✅ | + +MSP infrastructure access needs to be requested using Entitle for time-bound privileges. + +| ACCESS | ENTITLE REQUEST TEMPLATE | +| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| GCP project read access | [Read-only Entitle request for the 'Internal Services' folder](https://app.entitle.io/request?data=eyJkdXJhdGlvbiI6IjEwODAwIiwianVzdGlmaWNhdGlvbiI6IkVOVEVSIEpVU1RJRklDQVRJT04gSEVSRSIsInJvbGVJZHMiOlt7ImlkIjoiNzg0M2MxYWYtYzU2MS00ZDMyLWE3ZTAtYjZkNjY0NDM4MzAzIiwidGhyb3VnaCI6Ijc4NDNjMWFmLWM1NjEtNGQzMi1hN2UwLWI2ZDY2NDQzODMwMyIsInR5cGUiOiJyb2xlIn1dfQ%3D%3D) | +| GCP project write access | [Write access Entitle request for the 'Internal Services' folder](https://app.entitle.io/request?data=eyJkdXJhdGlvbiI6IjEwODAwIiwianVzdGlmaWNhdGlvbiI6IkVOVEVSIEpVU1RJRklDQVRJT04gSEVSRSIsInJvbGVJZHMiOlt7ImlkIjoiZTEyYTJkZDktYzY1ZC00YzM0LTlmNDgtMzYzNTNkZmY0MDkyIiwidGhyb3VnaCI6ImUxMmEyZGQ5LWM2NWQtNGMzNC05ZjQ4LTM2MzUzZGZmNDA5MiIsInR5cGUiOiJyb2xlIn1dfQ%3D%3D) | + +For Terraform Cloud access, see [dev Terraform Cloud](#dev-terraform-cloud). + +#### dev Cloud Run + +The Cloud Ops Dashboard dev service implementation is deployed on [Google Cloud Run](https://cloud.google.com/run). + +| PROPERTY | DETAILS | +| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Console | [Cloud Run service](https://console.cloud.google.com/run?project=cloud-ops-dev-caff) | +| Service logs | [GCP logging](https://console.cloud.google.com/logs/query;query=resource.type%20%3D%20%22cloud_run_revision%22%20-logName%3D~%22logs%2Frun.googleapis.com%252Frequests%22;summaryFields=jsonPayload%252FInstrumentationScope,jsonPayload%252FBody,jsonPayload%252FAttributes%252Ferror:false:32:end?project=cloud-ops-dev-caff) | +| Service traces | [Cloud Trace](https://console.cloud.google.com/traces/list?project=cloud-ops-dev-caff) | +| Service errors | [Sentry `cloud-ops-dev`](https://sourcegraph.sentry.io/projects/cloud-ops-dev/) | + +You can also use `sg msp` to quickly open a link to your service logs: + +```bash +sg msp logs cloud-ops dev +``` + +#### dev Redis + +| PROPERTY | DETAILS | +| -------- | ---------------------------------------------------------------------------------------------------------------------- | +| Console | [Memorystore Redis instances](https://console.cloud.google.com/memorystore/redis/instances?project=cloud-ops-dev-caff) | + +#### dev Terraform Cloud + +This service's configuration is defined in [`sourcegraph/managed-services/services/cloud-ops/service.yaml`](https://github.com/sourcegraph/managed-services/blob/main/services/cloud-ops/service.yaml), and `sg msp generate cloud-ops dev` generates the required infrastructure configuration for this environment in Terraform. +Terraform Cloud (TFC) workspaces specific to each service then provisions the required infrastructure from this configuration. +You may want to check your service environment's TFC workspaces if a Terraform apply fails (reported via GitHub commit status checks in the [`sourcegraph/managed-services`](https://github.com/sourcegraph/managed-services) repository, or in #alerts-msp-tfc). + +> [!NOTE] +> If you are looking for service logs, see the [dev Cloud Run](#dev-cloud-run) section instead. In general: +> +> - check service logs ([dev Cloud Run](#dev-cloud-run)) if your service has gone down or is misbehaving +> - check TFC workspaces for infrastructure provisioning or configuration issues + +To access this environment's Terraform Cloud workspaces, you will need to [log in to Terraform Cloud](https://app.terraform.io/app/sourcegraph) and then [request Entitle access to membership in the "Managed Services Platform Operator" TFC team](https://app.entitle.io/request?data=eyJkdXJhdGlvbiI6IjM2MDAiLCJqdXN0aWZpY2F0aW9uIjoiSlVTVElGSUNBVElPTiBIRVJFIiwicm9sZUlkcyI6W3siaWQiOiJiMzg3MzJjYy04OTUyLTQ2Y2QtYmIxZS1lZjI2ODUwNzIyNmIiLCJ0aHJvdWdoIjoiYjM4NzMyY2MtODk1Mi00NmNkLWJiMWUtZWYyNjg1MDcyMjZiIiwidHlwZSI6InJvbGUifV19). +The "Managed Services Platform Operator" team has access to all MSP TFC workspaces. + +> [!WARNING] +> You **must [log in to Terraform Cloud](https://app.terraform.io/app/sourcegraph) before making your Entitle request**. +> If you make your Entitle request, then log in, you will be removed from any team memberships granted through Entitle by Terraform Cloud's SSO implementation. + +The Terraform Cloud workspaces for this service environment are [grouped under the `msp-cloud-ops-dev` tag](https://app.terraform.io/app/sourcegraph/workspaces?tag=msp-cloud-ops-dev), or you can use: + +```bash +sg msp tfc view cloud-ops dev +``` diff --git a/content/departments/engineering/managed-services/cloud-relay.md b/content/departments/engineering/managed-services/cloud-relay.md index f92e0c9ee8c6..1a859c8a25d9 100644 --- a/content/departments/engineering/managed-services/cloud-relay.md +++ b/content/departments/engineering/managed-services/cloud-relay.md @@ -3,8 +3,8 @@ This document describes operational guidance for Cloud Relay infrastructure. diff --git a/content/departments/engineering/managed-services/cody-analytics.md b/content/departments/engineering/managed-services/cody-analytics.md index 29b3831e3afd..a5de4c7c726e 100644 --- a/content/departments/engineering/managed-services/cody-analytics.md +++ b/content/departments/engineering/managed-services/cody-analytics.md @@ -3,8 +3,8 @@ This document describes operational guidance for Cody Analytics infrastructure. diff --git a/content/departments/engineering/managed-services/entitler.md b/content/departments/engineering/managed-services/entitler.md index 24852f7a3f87..d2b111dc1114 100644 --- a/content/departments/engineering/managed-services/entitler.md +++ b/content/departments/engineering/managed-services/entitler.md @@ -3,8 +3,8 @@ This document describes operational guidance for Entitler infrastructure. diff --git a/content/departments/engineering/managed-services/gatekeeper.md b/content/departments/engineering/managed-services/gatekeeper.md index 4e414d28855b..709fcb8f0a3d 100644 --- a/content/departments/engineering/managed-services/gatekeeper.md +++ b/content/departments/engineering/managed-services/gatekeeper.md @@ -3,8 +3,8 @@ This document describes operational guidance for Cody Gatekeeper infrastructure. diff --git a/content/departments/engineering/managed-services/index.md b/content/departments/engineering/managed-services/index.md index ebf7ec833940..5b7141f3a431 100644 --- a/content/departments/engineering/managed-services/index.md +++ b/content/departments/engineering/managed-services/index.md @@ -3,11 +3,11 @@ -These pages contain generated operational guidance for the infrastructure of the 13 [Managed Services Platform (MSP)](../teams/core-services/managed-services/platform.md) services (across 19 environments) currently in operation at Sourcegraph. +These pages contain generated operational guidance for the infrastructure of the 13 [Managed Services Platform (MSP)](../teams/core-services/managed-services/platform.md) services (across 20 environments) currently in operation at Sourcegraph. This includes information about each service, configured environments, Entitle requests, common tasks, monitoring, custom documentation provided by service operators, and so on. In addition to service-specific guidance, [General guidance](#general-guidance) is also available. diff --git a/content/departments/engineering/managed-services/msp-testbed.md b/content/departments/engineering/managed-services/msp-testbed.md index 08f7b7f81878..2074a7e42364 100644 --- a/content/departments/engineering/managed-services/msp-testbed.md +++ b/content/departments/engineering/managed-services/msp-testbed.md @@ -3,8 +3,8 @@ This document describes operational guidance for MSP Testbed infrastructure. diff --git a/content/departments/engineering/managed-services/pings.md b/content/departments/engineering/managed-services/pings.md index 2cf1f72048d1..a0ffe259ee96 100644 --- a/content/departments/engineering/managed-services/pings.md +++ b/content/departments/engineering/managed-services/pings.md @@ -3,8 +3,8 @@ This document describes operational guidance for Pings Service infrastructure. diff --git a/content/departments/engineering/managed-services/releaseregistry.md b/content/departments/engineering/managed-services/releaseregistry.md index e3baea731d04..f07538d2dc77 100644 --- a/content/departments/engineering/managed-services/releaseregistry.md +++ b/content/departments/engineering/managed-services/releaseregistry.md @@ -3,8 +3,8 @@ This document describes operational guidance for Release Registry infrastructure. diff --git a/content/departments/engineering/managed-services/sams.md b/content/departments/engineering/managed-services/sams.md index 5461e848e2b9..ab05ea71a84e 100644 --- a/content/departments/engineering/managed-services/sams.md +++ b/content/departments/engineering/managed-services/sams.md @@ -3,8 +3,8 @@ This document describes operational guidance for Self-Serve Cody infrastructure. diff --git a/content/departments/engineering/managed-services/sourcegraph-accounts.md b/content/departments/engineering/managed-services/sourcegraph-accounts.md index 27a9cf039484..a5440f65b074 100644 --- a/content/departments/engineering/managed-services/sourcegraph-accounts.md +++ b/content/departments/engineering/managed-services/sourcegraph-accounts.md @@ -3,8 +3,8 @@ This document describes operational guidance for Sourcegraph Accounts infrastructure. diff --git a/content/departments/engineering/managed-services/support-integration.md b/content/departments/engineering/managed-services/support-integration.md index edeaf2496c2b..d0ab558701dd 100644 --- a/content/departments/engineering/managed-services/support-integration.md +++ b/content/departments/engineering/managed-services/support-integration.md @@ -3,8 +3,8 @@ This document describes operational guidance for Support Integration infrastructure. diff --git a/content/departments/engineering/managed-services/telemetry-gateway.md b/content/departments/engineering/managed-services/telemetry-gateway.md index 0808e45a4cc1..28f32cef3ef5 100644 --- a/content/departments/engineering/managed-services/telemetry-gateway.md +++ b/content/departments/engineering/managed-services/telemetry-gateway.md @@ -3,8 +3,8 @@ This document describes operational guidance for Telemetry Gateway infrastructure. diff --git a/content/departments/people-talent/people-ops/process/compensation-and-leveling/preparing-for-calibrations.md b/content/departments/people-talent/people-ops/process/compensation-and-leveling/preparing-for-calibrations.md index d458e43f84f7..7e836f1e5a2f 100644 --- a/content/departments/people-talent/people-ops/process/compensation-and-leveling/preparing-for-calibrations.md +++ b/content/departments/people-talent/people-ops/process/compensation-and-leveling/preparing-for-calibrations.md @@ -45,12 +45,12 @@ Performance calibrations provide an opportunity to review and calibrate performa 1. Participating Managers will ask clarifying questions, provide feedback/insight, either challenging or confirming the Teammate’s placement. See [participant expectations](#part-2-participant-expectations). 2. Managers/Calibration Participants align on scores for Teammates discussed. See [details on aligning on score](#part-3-aligning-on-the-scores). -2. **Calibrate `2` Ratings:** Managers will explain the rating assessment of each Teammate in correspondence to their level and for those Teammates that received a _1 - Superior Performance_ category for performance, validating the placement with tangible examples. [More details](#part-1-discussion). +2. **Calibrate `2` Ratings:** Managers will explain the rating assessment of each Teammate in correspondence to their level and for those Teammates that received a _2 - Superior Performance_ category for performance, validating the placement with tangible examples. [More details](#part-1-discussion). 1. Participating Managers will ask clarifying questions, provide feedback/insight, either challenging or confirming the Teammate’s placement. See [participant expectations](#part-2-participant-expectations). 2. Managers/Calibration Participants align on scores for Teammates discussed. See [details on aligning on score](#part-3-aligning-on-the-scores). -3. **Calibrate `4` Ratings:** Managers will explain the rating assessment of each Teammate in correspondence to their level and for those Teammates that received a _1 - Partially Successful Performance_ category for performance, validating the placement with tangible examples. [More details](#part-1-discussion). +3. **Calibrate `4` Ratings:** Managers will explain the rating assessment of each Teammate in correspondence to their level and for those Teammates that received a _4 - Partially Successful Performance_ category for performance, validating the placement with tangible examples. [More details](#part-1-discussion). 1. Participating Managers will ask clarifying questions, provide feedback/insight, either challenging or confirming the Teammate’s placement. See [participant expectations](#part-2-participant-expectations). 2. Managers/Calibration Participants align on scores for Teammates discussed. See [details on aligning on score](#part-3-aligning-on-the-scores). diff --git a/content/departments/people-talent/people-ops/process/teammate-sentiment/impact-reviews/index.md b/content/departments/people-talent/people-ops/process/teammate-sentiment/impact-reviews/index.md index 4da7a937404b..7c3eb67005ad 100644 --- a/content/departments/people-talent/people-ops/process/teammate-sentiment/impact-reviews/index.md +++ b/content/departments/people-talent/people-ops/process/teammate-sentiment/impact-reviews/index.md @@ -20,7 +20,6 @@ Our impact review process follows the 360-degree feedback model, which is a perf - If you received a 3 rating, you are eligible for a merit increase once a year. Because of this, those who started on or after Feb 1 2023 are not eligible for a merit increase in 2H FY24 impact review cycle. They will be eligible in the 1H FY25 review cycle instead. - Note: to be eligible to participate in a review cycle, a Teammate must have worked at least **4-months** in that given review period and have received a performance rating of a “3” or higher. - On average, Teammates can expect to have their compensation increased for merit purposes **_once a year_** if they are meeting expectations. -- Teammates can receive compensation increases 2x per year for exceptional performance (Rating score: "Distinguished" or "Superior" performance with a 1 or 2 rating), but the **expectation is that Teammates receive a comp review 1x per year** - Teammates who receive a 4 or 5 rating are not eligible for a compensation increase. - Teammates can also receive a compensation increase due to updates to compensation bands and recalibration of the 75th percentile. This is not inclusive of any FX changes for PEO teammates and only applicable when the respective compensation band is updated. - Note: If you received a 15% increase in the prior 12mo period as part of our standard merit cycle you will not be eligible for an increase UNLESS you got a promotion or had a role change. If you received an off-cycle increase or promotion AFTER the last merit cycle, you're not eligible for a merit increase this cycle. @@ -264,7 +263,7 @@ More information about our commitment to Pay Transparency and our overall compen Merit increases require the recommendation of the Teammate’s immediate Manager and the approval of the VP of People & Talent. Teammates will be notified of their merit increase as soon as possible after all Teammate merit increases for the year have been approved. -Teammate performance is to be formally reviewed at least twice a year. The focus of the review is to discuss their performance for the rating period, review standards for the position, communicate the amount of any merit increase, and set goals for the next rating period. +Teammate performance is to be formally reviewed once a year. The focus of the review is to discuss their performance for the rating period, review standards for the position, communicate the amount of any merit increase, and set goals for the next rating period. ### What is the approval process for merit or promotion increases outside of a performance cycle? diff --git a/content/departments/product/design/index.md b/content/departments/product/design/index.md index ab969fc6a743..fde0a14847a4 100644 --- a/content/departments/product/design/index.md +++ b/content/departments/product/design/index.md @@ -12,6 +12,7 @@ Our mission is to put beautifully designed software in the hands of every develo Designer (he/him) - [Daniel Marques](../../../team/index.md#daniel-marques) – Product Designer (he/him) +- Taiyab Raja – Product Designer (he/him) ### UX Research diff --git a/content/team/locations.geojson b/content/team/locations.geojson index 8ef2381e952d..71f653f1b757 100644 --- a/content/team/locations.geojson +++ b/content/team/locations.geojson @@ -40,19 +40,6 @@ ] } }, - { - "type": "Feature", - "properties": { - "name": "Joe Chen" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 120.08056640625, - 30.290496154756223 - ] - } - }, { "type": "Feature", "properties": {