Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/index-autocomplete-search.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Index autocomplete search in Elasticsearch

# **What it does**: Indexes autocomplete data (general and AI search) into Elasticsearch.
# **Why we have it**: So we can power the APIs for autocomplete.
# **What it does**: Indexes AI search autocomplete data into Elasticsearch.
# **Why we have it**: So we can power the APIs for AI search autocomplete.
# **Who does it impact**: docs-engineering

on:
Expand Down Expand Up @@ -40,11 +40,6 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: curl --fail --retry-connrefused --retry 5 -I http://localhost:9200

- name: Run general auto-complete indexing
env:
ELASTICSEARCH_URL: ${{ github.event_name == 'pull_request' && 'http://localhost:9200' || secrets.ELASTICSEARCH_URL }}
run: npm run index-general-autocomplete -- docs-internal-data

- name: Run AI search auto-complete indexing
env:
ELASTICSEARCH_URL: ${{ github.event_name == 'pull_request' && 'http://localhost:9200' || secrets.ELASTICSEARCH_URL }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ jobs:
- shielding
# - tests
# - tools
- tracking
- versions
- webhooks
- workflows
Expand Down
54 changes: 54 additions & 0 deletions content/billing/managing-your-billing/about-usage-reports.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
title: About usage reports
intro: 'Learn how to request and understand a report that shows detailed {% data variables.product.github %} usage and billing information for your account.'
versions:
feature: enhanced-billing-platform
type: how_to
topics:
- Enterprise
- Team
permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
---

The usage report shows detailed information about your account’s {% data variables.product.github %} usage, including how much of each SKU was used and the resulting billable amount.

To generate a usage report, see [AUTOTITLE](/billing/managing-your-billing/gathering-insights-on-your-spending).

## Usage report fields

The usage report contains the following fields.

| Field | Description |
|---------------------------|-------------|
| `date` | The day that the usage occurred. All usage is logged in UTC. |
| `product` | The {% data variables.product.github %} product that was used. |
| `sku` | The specific {% data variables.product.github %} product SKU that was used. |
| `quantity` | The amount of the SKU that was used. |
| `unit_type` | The unit of measurement for the product SKU. |
| `applied_cost_per_quantity` | The unit cost of the product SKU. |
| `gross_amount` | The amount of the product SKU that was used. |
| `discount_amount` | The amount of usage that was discounted. Usage that is discounted as part of your account’s included usage is reflected in this field. Also includes discounts for {% data variables.product.prodname_actions %} usage for standard {% data variables.product.github %}-hosted runners in public repositories and for self-hosted runners. |
| `net_amount` | The billable amount of usage after applying the `discount_amount`. This is the amount that your account will be billed. `gross_amount - discount_amount = net_amount`. |
| `username` | The user associated with the usage, if applicable. |
| `organization` | The organization associated with the usage, if applicable. |
| `repository` | The repository associated with the usage, if applicable. |
| `workflow_path` | The path of the {% data variables.product.prodname_actions %} workflow that generated the usage, if applicable. |
| `cost_center_name` | The cost center associated with the usage, if applicable. |

### Deprecated report fields

{% data variables.product.github %} aims to minimize changes to the usage report structure, however at times the report structure or fields may change.

| Deprecated field | Replacement |
|--------------------|---------------------|
| `usage_at` | Refer to `date` instead. |
| `workflow_name` | Refer to `workflow_path` instead. |

## How usage is summarized

To reduce the size of the report, similar usage entries are grouped and totaled. The report summarizes the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values: `date`, `sku`, `username`, `workflow_path`, `repository`, `cost_center_name`.

## Receiving the report

Usage reports are sent via email to the default email address associated with your {% data variables.product.github %} account.
1 change: 1 addition & 0 deletions content/billing/managing-your-billing/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ children:
- /adding-licenses-to-an-organization
- /roles-for-the-new-billing-platform
- /estimating-spending
- /about-usage-reports
- /gathering-insights-on-your-spending
- /charging-business-units
- /preventing-overspending
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ The current functionality and availability of the two types of review is summari

{% rowheaders %}

| | Review selection | Review changes |
|------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Available in | {% data variables.product.prodname_vscode %} | {% data variables.product.prodname_vscode %} and the {% data variables.product.github %} website |
| | Review selection | Review changes |
|------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Available in | {% data variables.product.prodname_vscode %} | {% data variables.product.prodname_vscode %} and the {% data variables.product.github %} website |
| Premium/standard feature | Standard feature available to all {% data variables.product.prodname_copilot_short %} subscribers | Premium feature. Available with the {% data variables.copilot.copilot_pro_short %}, {% data variables.copilot.copilot_pro_plus_short %}, {% data variables.copilot.copilot_business_short %}, and {% data variables.copilot.copilot_enterprise_short %} plans. Per-person monthly quota applies. |
| Description | Initial review of a highlighted section of code with feedback and suggestions | Deeper review of all changes |
| Language support | All | C, C#, C++, Go, Java, JavaScript, Kotlin, Markdown, Python, Ruby, Swift, TypeScript <br><br> {% data variables.release-phases.public_preview_caps %} support for HTML and Text. |
| Custom coding guidelines support | No | Yes, see [Customizing {% data variables.product.prodname_copilot_short %}'s reviews with coding guidelines](#customizing-copilots-reviews-with-coding-guidelines) |
| Description | Initial review of a highlighted section of code with feedback and suggestions | Deeper review of all changes |
| Language support | All | All |
| Custom coding guidelines support | No | Yes, see [Customizing {% data variables.product.prodname_copilot_short %}'s reviews with coding guidelines](#customizing-copilots-reviews-with-coding-guidelines) |

{% endrowheaders %}

Expand Down
5 changes: 1 addition & 4 deletions data/reusables/copilot/policies-for-dotcom.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
* **Opt in to user feedback collection:** If enabled, users can provide feedback on {% data variables.product.prodname_copilot_short %} pull request summaries. For more information, see [AUTOTITLE](/enterprise-cloud@latest/copilot/github-copilot-enterprise/copilot-pull-request-summaries/creating-a-pull-request-summary-with-github-copilot).
* **Opt in to preview features:** If enabled, users can test new {% data variables.product.prodname_copilot_short %} features that are not yet generally available. Be aware that previews of features may have flaws, and the features may be changed or discontinued at any time. Current previews of {% data variables.product.prodname_copilot_short %} features include:

* Experimental languages in {% data variables.product.prodname_copilot_short %} code review. See [AUTOTITLE](/copilot/using-github-copilot/code-review/using-copilot-code-review).
* {% data variables.copilot.copilot_spaces %}. See [AUTOTITLE](/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces).
* **Opt in to preview features:** If enabled, users can test new {% data variables.product.prodname_copilot_short %} features that are not yet generally available. Be aware that previews of features may have flaws, and the features may be changed or discontinued at any time. Current previews of {% data variables.product.prodname_copilot_short %} features include {% data variables.copilot.copilot_spaces %}. See [AUTOTITLE](/copilot/using-github-copilot/copilot-spaces/about-organizing-and-sharing-context-with-copilot-spaces).
13 changes: 1 addition & 12 deletions data/ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ release_notes:
banner_text: GitHub began rolling these changes out to enterprises on
search:
input:
aria_label: Open search overlay
placeholder: Search or ask {{icon}} Copilot
placeholder_no_icon: Search or ask Copilot
shortcut: Type {{icon}} to search
Expand Down Expand Up @@ -320,17 +319,7 @@ alerts:
WARNING: Warning
TIP: Tip
CAUTION: Caution
domain_edit:
name: Domain name
edit: Edit
edit_your: Edit your domain name
experimental: Experimental
your_name: Your domain name
cancel: Cancel
save: Save
snippet_about: Updating will include the new domain name in all code snippets across GitHub Docs.
learn_more: Learn more
submission_failed: Submission failed. Please try again in a minute.

cookbook_landing:
spotlight: Spotlight
explore_articles: Explore {{ number }} prompt articles
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
"general-search-scrape-server": "cross-env NODE_ENV=production PORT=4002 MINIMAL_RENDER=true CHANGELOG_DISABLED=true tsx src/frame/server.ts",
"ghes-release-scrape-with-server": "cross-env GHES_RELEASE=1 start-server-and-test general-search-scrape-server 4002 general-search-scrape",
"general-search-scrape-with-server": "cross-env NODE_OPTIONS='--max_old_space_size=8192' start-server-and-test general-search-scrape-server 4002 general-search-scrape",
"index": "tsx src/search/scripts/index/index-cli autocomplete docs-internal-data",
"index-ai-search-autocomplete": "tsx src/search/scripts/index/index-cli ai-search-autocomplete",
"index-general-autocomplete": "tsx src/search/scripts/index/index-cli general-autocomplete",
"index-general-search": "tsx src/search/scripts/index/index-cli general-search",
"index-test-fixtures": "./src/search/scripts/index-test-fixtures.sh",
"labeler": "tsx .github/actions/labeler/labeler.ts",
Expand Down
2 changes: 0 additions & 2 deletions src/content-render/unified/processor.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import wrapProceduralImages from './wrap-procedural-images.js'
import parseInfoString from './parse-info-string.js'
import annotate from './annotate.js'
import alerts from './alerts.js'
import replaceDomain from './replace-domain.js'
import removeHtmlComments from 'remark-remove-comments'
import remarkStringify from 'remark-stringify'

Expand All @@ -49,7 +48,6 @@ export function createProcessor(context) {
.use(headingLinks)
.use(codeHeader)
.use(annotate)
.use(replaceDomain)
.use(highlight, {
languages: { ...common, graphql, dockerfile, http, groovy, erb, powershell },
subset: false,
Expand Down
37 changes: 0 additions & 37 deletions src/content-render/unified/replace-domain.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ children:
- /permissions
- /code-annotations
- /alerts
- /replace-domain
- /html-comments
---

This file was deleted.

13 changes: 1 addition & 12 deletions src/fixtures/fixtures/data/ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ release_notes:
banner_text: GitHub began rolling these changes out to enterprises on
search:
input:
aria_label: Open search overlay
placeholder: Search or ask {{icon}} Copilot
placeholder_no_icon: Search or ask Copilot
shortcut: Type {{icon}} to search
Expand Down Expand Up @@ -320,17 +319,7 @@ alerts:
WARNING: Warning
TIP: Tip
CAUTION: Caution
domain_edit:
name: Domain name
edit: Edit
edit_your: Edit your domain name
experimental: Experimental
your_name: Your domain name
cancel: Cancel
save: Save
snippet_about: Updating will include the new domain name in all code snippets across GitHub Docs.
learn_more: Learn more
submission_failed: Submission failed. Please try again in a minute.

cookbook_landing:
spotlight: Spotlight
explore_articles: Explore {{ number }} prompt articles
Expand Down
32 changes: 0 additions & 32 deletions src/fixtures/tests/playwright-rendering.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -844,35 +844,3 @@ test.describe('translations', () => {
await expect(page).toHaveURL('/ja/get-started/start-your-journey/hello-world')
})
})

test.describe('view pages with custom domain cookie', () => {
test('view article page', async ({ page }) => {
await page.goto(
'/enterprise-server@latest/get-started/markdown/replace-domain?ghdomain=example.ghe.com',
)

const content = page.locator('pre')
await expect(content.nth(0)).toHaveText(/curl https:\/\/example.ghe.com\/api\/v1/)
await expect(content.nth(1)).toHaveText(/curl https:\/\/HOSTNAME\/api\/v2/)
await expect(content.nth(2)).toHaveText('await fetch("https://example.ghe.com/api/v1")')
await expect(content.nth(3)).toHaveText('await fetch("https://HOSTNAME/api/v2")')

// Now switch to enterprise-cloud, where replacedomain should not be used
await page.getByLabel('Select GitHub product version').click()
await page.getByLabel('Enterprise Cloud', { exact: true }).click()

await expect(content.nth(0)).toHaveText(/curl https:\/\/HOSTNAME\/api\/v1/)
await expect(content.nth(1)).toHaveText(/curl https:\/\/HOSTNAME\/api\/v2/)
await expect(content.nth(2)).toHaveText('await fetch("https://HOSTNAME/api/v1")')
await expect(content.nth(3)).toHaveText('await fetch("https://HOSTNAME/api/v2")')

// Again switch back to enterprise server again
await page.getByLabel('Select GitHub product version').click()
await page.getByLabel('Enterprise Server 3.').first().click()

await expect(content.nth(0)).toHaveText(/curl https:\/\/example.ghe.com\/api\/v1/)
await expect(content.nth(1)).toHaveText(/curl https:\/\/HOSTNAME\/api\/v2/)
await expect(content.nth(2)).toHaveText('await fetch("https://example.ghe.com/api/v1")')
await expect(content.nth(3)).toHaveText('await fetch("https://HOSTNAME/api/v2")')
})
})
Loading
Loading