Skip to content

Add Multi-Tenant Usage Metering and Billing partner docs (PSAOKR-5462) - #38581

Open
lucarelli111 wants to merge 53 commits into
masterfrom
alessandro.lucarelli/PSAOKR-5462-partner-documentation-updates
Open

Add Multi-Tenant Usage Metering and Billing partner docs (PSAOKR-5462)#38581
lucarelli111 wants to merge 53 commits into
masterfrom
alessandro.lucarelli/PSAOKR-5462-partner-documentation-updates

Conversation

@lucarelli111

@lucarelli111 lucarelli111 commented Jul 29, 2026

Copy link
Copy Markdown

Summary

  • Adds a new partner-facing documentation section under content/en/partners/multi_tenant_billing/ covering the Admin Org: what it is and its capabilities (including Preview features), requesting one, onboarding a customer, Trial Org provisioning, cost/usage visibility, centralized usage metrics, customer pricing and contracts management (Preview), and troubleshooting.
  • Incorporates review feedback from David (written, doc) and Pierre (verbal): restructured the landing page into a dedicated "Requesting an Admin Org" section plus a separate "Getting started" pointer, renamed "Trial Org Creator" to "Trial Org Provisioner" throughout, added "(Preview)" to the Customer Pricing/Contracts Management titles and nav entries, replaced circular "What's next" links with non-sequential "Related pages" sections, and tightened redundant or overloaded phrasing in a few pages.
  • Draft PR opened to get a preview build; not yet ready for full review.

AI assistance

Content sourced from internal Confluence pages and partner enablement decks, and structured/worded to match existing doc patterns in this repo (tracing/_index.md, account_management/plan_and_usage/partner_experience.md).

Test plan

  • Review rendered preview once the build completes
  • Confirm content with PSAOKR-5462 stakeholders before merging

Known issues (not fixing in this PR)

  • admin_org_hierarchy.png diagram still labels "Partner Admin Org" instead of "Admin Org."
  • customer_contracts.png has a stray empty input-box artifact next to a few customer rows.

New section under content/en/partners/multi_tenant_billing/ covering the
Admin Org: what it is and its capabilities (including preview features),
requesting one, Trial Org provisioning, cost/usage visibility, and
troubleshooting.
Merge Overview/capability-list redundancy into concise, action-oriented
sections modeled on cloud_cost_management/_index.md and
plan_and_usage/_index.md. Replace ad-hoc HTML alert divs with the
site's bold-prefixed Note/Important convention, use {{< ui >}}
consistently for in-app element names, and tighten prose.
…view / Getting started / Use cases / Troubleshooting)
@lucarelli111 lucarelli111 added the WORK IN PROGRESS No review needed, it's a wip ;) label Jul 29, 2026
@github-actions

github-actions Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot added the Architecture Everything related to the Doc backend label Jul 31, 2026
…ecklist

- Fix Vale violation: 'ensures' -> rephrase
- Wrap remaining bold-only UI element names in {{< ui >}} for consistency
  (Trial Org Provisioning dashboard, Customer Pricing, Customer Contracts tabs)
- Match heading/link-text capitalization to actual page titles (Cost and
  Usage Visibility, Trial Org Provisioning) per the title-consistency check
- Remove orphaned further_reading front matter on cost-and-usage-visibility.md
  (never rendered - no whats-next partial call on that page - and duplicated
  its own inline reference links)
Placeholder 1x1 PNGs at static/images/partners/multi_tenant_billing/ for
each {{< img >}} reference in _index.md - replace with real screenshots
before merging.
@github-actions github-actions Bot added the Images Images are added/removed with this PR label Jul 31, 2026
- New content/en/partners/multi_tenant_billing/centralized-usage-metrics.md,
  based on the internal EUM/UM/Admin Org roll-up doc, filtered to what's
  partner-facing (drops internal Mosaic/consul-config flags, Slack channel,
  and C&A team ownership note - replaced with the standard
  partner-support@datadoghq.com contact for enabling UM roll-up)
- No longer marked (Preview) - capability is GA
- _index.md: shortened teaser section, added nav/whatsnext links to the
  new page, updated Use Cases table
- cost-and-usage-visibility.md: removed now-duplicated Centralized Usage
  Metrics section, cross-links to the new page instead
- Added the new page to config/_default/menus/partners.en.yaml
Datadog's own billing nav links to the 'Estimated Usage Metrics' page
with the text 'Usage Metrics', treating 'estimated' as a plain
descriptive word rather than a branded acronym pair. EUM/UM are
internal-only shorthand.
…nshots

- List the 6 real Usage Metering API endpoints with links and the correct
  include_connected_accounts / filter[include_connected_accounts] flag per
  endpoint, on both _index.md and cost-and-usage-visibility.md
- Correct Trial Org Provisioning: it's the Admin Org homepage, not a
  Dashboards-menu item (troubleshooting.md, trial-org-provisioning.md,
  _index.md)
- Remove plan_and_usage_admin_org.png screenshot/reference - redundant
  with the linked Plan and Usage Experience for Partners page
- Add real screenshots: admin_org_hierarchy, customer_contracts,
  customer_pricing, usage_metrics_rollup
- New customer-onboarding.md, based on the internal Customer Onboarding
  Process for Partner doc: register deal -> create Trial Org -> share
  Trial Org ID with the PSM. Corrects the source's outdated 'navigate to
  Dashboards' instruction and drops dated 'as of <date>' framing.
- Wired into _index.md (Overview pointer, first whatsnext link) and the
  left nav (weight 5, ahead of Requesting an Admin Org).
- Removed the three _index.md H3 sections that duplicated their own
  dedicated pages (Cost and Usage Visibility, Trial Org Provisioning,
  Centralized Usage Metrics) - those topics now live only in the Use
  Cases table + their dedicated page, matching how tracing/_index.md
  only keeps full sections for topics without a separate deep page.
- Moved the Trial Org Provisioning and Centralized Usage Metrics
  screenshots onto their dedicated pages along with the removed sections.
- trial-org-provisioning.md: removed the inaccurate 'PSM is notified
  automatically' claim, fixed a leftover step-numbering gap.
- centralized-usage-metrics.md: dropped the tag descriptions to match
  the source's literal parent/child framing; removed the preview/enable
  section now that the capability is GA.
- Trial Org usage is not visible from the Admin Org until the customer
  org has an active contract tied to the partnership (confirmed) - fixed
  trial-org-provisioning.md and customer-onboarding.md, which both
  implied automatic rollup on Trial Org creation.
- _index.md: fixed 'manage billing' contradicting the read-only-access
  alert two lines below - changed to 'view billing'.
- Updated admin_org_hierarchy.png screenshot.
…tor in request

- _index.md: clarify the read-only/no-billing-changes alert applies by
  default, and the Preview capabilities below add supported pricing and
  contract-management workflows (was a flat contradiction otherwise).
- requesting-an-admin-org.md: note that partners planning to provision
  trials should include the Trial Org Creator capability in the initial
  request, since it's a separate opt-in capability, not bundled by
  default.
- whatsnext/nav order: Requesting an Admin Org -> Onboarding a New
  Customer -> Trial Org Provisioning -> Cost and Usage Visibility ->
  Centralized Usage Metrics -> Troubleshooting (get the org before
  using it).
- Use Cases table: rename 'How an Admin Org helps' column to
  'Capability', and name the capability directly ('[X]: does Y')
  instead of 'Use X to Y' in every row - matches the Name: description
  pattern already used in the whatsnext block.
- The page only had two real facts (prerequisites, contact) surrounded
  by internal-mechanics detail irrelevant to a partner (Partner Plan,
  separate contract, US1-site creation, read-only access already stated
  in the Getting started alert). Deleted it and folded the prerequisites
  + contact directly into _index.md's Getting started section.
- Contact is now partner-support@datadoghq.com only, not 'or a PSM' -
  the PSM alternative wasn't the intended request path.
- Updated all cross-references (customer-onboarding.md,
  cost-and-usage-visibility.md, centralized-usage-metrics.md) and the
  left nav to drop the removed page.
- cost-and-usage-visibility.md: softened 'The same data is available
  programmatically' to 'Cost and usage data is also available...' -
  the API and UI aren't guaranteed to return identical data.
…iew gaps

- Broaden 'resell or MSP partner' to include systems integrator partners
  throughout (Overview + eligibility bullet).
- Replace 'PSM'/'Partner Sales Manager' with 'partner account team',
  matching how other Datadog partner docs refer to this contact
  (partner-support@datadoghq.com / 'Datadog partner representative'
  are the established terms; naming a specific role isn't).
- customer-onboarding.md: merge the trial-to-paid transition into the
  existing 'Share the Trial Org' section instead of a new redundant
  section - continue working with the partner account team through to
  a signed contract.
- trial-org-provisioning.md: add a 'Find the Trial Org ID' fallback
  section (browser console / bookmarklet), adapted from the equivalent
  section in getting_started/laying-the-groundwork.md, for partners who
  didn't capture the org ID from the result panel.
- cost-and-usage-visibility.md: state that a Trial Org's usage isn't
  included until its customer org is connected (previously only stated
  on other pages, not the page most likely to be checked for it), and
  that final invoices are the authoritative source for billed amounts,
  not the estimated/projected views shown here.
…reenshot placement

- Registration/eligibility now uses the official DPN terminology
  (Solution Provider) instead of the earlier guessed resell/MSP/SI
  enumeration.
- Add a Register Now link (partners.datadoghq.com/s/login/) for
  partners not yet registered, before the partner-support contact
  instruction for already-registered partners.
- Move the Partner Portal registration screenshot to sit right after
  the Register Now sentence instead of before it.
- Trial Org Creator note reformatted as a proper Note callout.

Full review pass against our style rules across all six pages:
- Fixed redundant phrasing ('by Datadog' after 'Datadog partner',
  'as early as possible, even at an early stage').
- Genericized the remaining 'Partner Solutions Architect (PSA)'
  reference to 'partner account team', matching the PSM fix.
- Updated stale scope language now that Onboarding a New Customer
  covers the full path through contract signature, not just Trial Org
  creation - 'a live Trial Org' -> 'a connected customer organization'
  in _index.md (twice) and customer-onboarding.md's description/Overview,
  and the Overview's 'two steps' updated to the actual three-part flow.
- Verified no Vale-flagged words, filler words, you/your, orphaned
  refs, or dangling links to the removed Requesting an Admin Org page
  across all six files.
…w, fold Trial Org Creator line into prose

The two notes sat side-by-side in Getting started with mismatched
styles (one HTML alert box, one plain bold text). Moved the read-only
access alert to the Overview where it fits conceptually (describing
what an Admin Org is/does), and folded the short Trial Org Creator
sentence into the preceding paragraph instead of styling it as its
own note.
Merged sentence fragments didn't parse as valid English, and 'Centralize'
was missing the 'd' to match the page title. Rewrote to preserve the
intent (Admin Org oversees rolled-up, tagged metrics across the book
of business) as two clean sentences.
…agement

Matches the site-wide convention (e.g. deployment_gates/_index.md):
a {{< callout >}} banner with a Request Access button, right after
the front matter. Pointed at partner-support@datadoghq.com since
there's no public product-preview signup form for these partner-
specific capabilities. Removed the now-redundant 'contact support to
join the preview' What's next sections on both pages.
…ed section

customer-pricing-management.md: corrected the configuration steps
against the real UI (extracted from the source doc's embedded
screenshots) - the View dropdown, editing via Edit before entering
prices, the % Price Adjustment bulk tool, and the two non-contracted-
product toggles (Set Custom Price Adjustment, Cap ingest markup at
Datadog list price) instead of the earlier guessed 'bill at list price
or apply a markup' framing.

customer-contracts-management.md: removed the 'Not yet included'
section per feedback.
The {{< callout >}} Request Access button doesn't work for these
partner-specific previews (no public product-preview signup exists
for them) - dropped it from both pages, folding the preview status
back into a plain Overview sentence. Also removed the 'Datadog works
with partners under two contract models' background from Customer
Contracts Management - irrelevant to a partner who already knows
their own contract type, lifted from the PRD's context section rather
than written for this audience.
@jhgilbert

Copy link
Copy Markdown
Collaborator

[Automated message] This PR has merge conflicts created by the docs repo reorg project. Because this PR is marked as a work in progress, no attempt was made to auto-resolve the conflicts. When your PR is finished, you can queue your PR for an auto-fix by removing the WORK IN PROGRESS label and the astro-reorg-skip label. Your PR will be processed in the next batch of attempted auto-fixes.

This is an automated comment, but if you have a question, you can mention me in this PR (external contributors) or reach out in #docs-repo-reorg-support on Slack (internal contributors).

@jhgilbert jhgilbert added astro-reorg-skip Needs manual conflict resolution after replatforming reorg astro-reorg-processed Needs manual conflict resolution after replatforming reorg labels Aug 6, 2026
…Provisioner, fix nav labels

Split the landing page's intro section into "Requesting an Admin Org"
(eligibility, registration, what to include when requesting) and a
separate "Getting started" pointer to the rest of the docs. Rename
"Trial Org Creator" to "Trial Org Provisioner" to match the actual
capability name. Add "(Preview)" to the Customer Pricing/Contracts
Management titles and nav entries. Replace circular "What's next"
links between Cost and Usage Visibility and Centralized Usage Metrics
with non-sequential "Related pages" sections. Tighten redundant
"book of business" phrasing and an overloaded sentence in Customer
Contracts Management. Add a troubleshooting entry for partners not
invited to a new Admin Org.
…py fixes

Pull the Customer Contracts Portal FAQ doc's key features, screenshots,
and Q&A into customer-contracts-management.md: contract MRR/UMRR,
influence status, drawdown depletion, overdue invoices, cost-visibility
status per customer, and key contacts (CSM/AE/partner account
team/billing contact), plus two new screenshots and an FAQ section.

Reorder the section nav from alphabetical to the partner lifecycle
(Onboarding -> Trial Org Provisioning -> Cost and Usage Visibility ->
Centralized Usage Metrics -> Customer Pricing Management -> Customer
Contracts Management -> Troubleshooting), matching the Use Cases table
order in _index.md to the same sequence.

Rename "What's next"/"Related pages" to "Related docs" on Cost and
Usage Visibility and Onboarding a New Customer, since those sections
list related material rather than a build sequence. Explain the
30-day grace period on Cost and Usage Visibility, and drop the
"while Datadog validates them" clause from the Preview alert.
@datadog-datadog-prod-us1-2

This comment has been minimized.


<div class="alert alert-info">By default, an Admin Org grants read-only access to cost and usage data for connected customer organizations, and personal or internal Datadog usage on the Admin Org is not supported. The Preview capabilities below add supported pricing and contract-management workflows.</div>

A customer organization is connected to an Admin Org automatically when its Datadog contract includes the partnership and is active. After connecting, a customer's usage and cost data is visible from the Admin Org, across all Datadog sites (for example, AP1, EU1, US1, US3, US5), except US1-FED, which requires its own Admin Org for regulatory purposes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and will be automatically disconnected when the contract expired

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw that there is a mention in Cost and Usage Visibility page :)


**Note**: All costs shown to the customer are estimated. They typically match the partner's invoice, though minor differences of a few cents can occur.

## Limitations

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth mentioning this feature only support USD in currency? Many partners/resellers bill their customers in local currency, so they have to workaround that with foreign exchange conversion etc.

lucarelli111 and others added 13 commits August 26, 2026 12:12
…hugo/

master moved the entire Hugo site (content/, static/, config/, etc.)
under a new top-level hugo/ directory while this branch was open. The
menu edit merges cleanly via git's rename detection; the new pages and
images added by this branch don't exist upstream so git can't rename
them automatically - move them by hand to their hugo/ equivalents:
hugo/content/en/partners/multi_tenant_billing/,
hugo/static/images/partners/multi_tenant_billing/. Also adds the
pending app.datadoghq.com/billing/customer-contracts direct-link
addition to Customer Contracts Management.
Customer Pricing Management and Customer Contracts Management move
out of the Preview capabilities in the multi-tenant billing partner
section, into core product documentation under
account_management/plan_and_usage/partner_experience/, alongside each
other. Per agreement with the PM: Customer Pricing is authored
separately in main docs (not yet merged, on rliu/end-customer-cost-
visibility-docs); Customer Contracts moves here as customer_contracts.md,
carrying over its images (renamed to match this directory's hyphenated
convention) and content unchanged.

Remove both from the multi_tenant_billing left nav and from the
_index.md Use Cases table's own page links, pointing instead to the
new account_management URLs. Add a left-nav entry for Customer
Contracts nested under Partner Experience in main.en.yaml.
…-partner-documentation-updates' into alessandro.lucarelli/PSAOKR-5462-partner-documentation-updates
…ar nesting

Drop "Management" and "(Preview)" from the page's title/name; the
Preview status is now conveyed only via an alert-danger caution box
at the top of the page (matching the pattern used on
forwarding_audit_events.md), not in the name itself. _index.md's own
"(Preview)" tag for Customer Contracts and the generic intro alert
wording are unaffected by the title change, since the capability
itself is still Preview.

Fix the left-nav sidebar not showing Customer Contracts nested under
Partner Experience: left-nav.html hides a level-3 item's children by
default (d-none) unless its identifier is in a hardcoded whitelist.
Add account_management_partner_experience to that whitelist.
Drop the "(Preview)" tag from Customer Pricing's row in the Use Cases
table too, matching Customer Contracts - both capabilities remain
Preview, just not labeled in the table.

On the Customer Contracts page: fold the two FAQ entries into the page
body directly (Admin Org requirement noted inline where it's first
needed, Billing Read permission as a Note near the nav step) instead
of a separate FAQ section. Replace the further_reading front matter
(confirmed not rendered by this page's layout - the whats-next partial
that reads it is only wired into a few unrelated templates) with a
manual "Further Reading" section, matching the parent Partner
Experience page's naming.
…t URL

Wrapping a markdown reference link inside {{< ui >}} broke rendering
(printed a literal unresolved [3] instead of a link) - {{< ui >}} isn't
meant to wrap link syntax, just plain UI label text, matching every
other page in this doc set. Since the UI label itself can't cleanly be
a hyperlink, drop the direct-URL link entirely rather than work around
it, and remove the now-unused [3] reference.
Revert the account_management/plan_and_usage/partner_experience
relocation - Customer Pricing and Customer Contracts moving into core
product docs will be handled together in a separate PR instead. Restore
customer-contracts-management.md and its images under
partners/multi_tenant_billing/, restore its partners.en.yaml nav entry,
and drop the main.en.yaml entry and left-nav.html whitelist addition
that were only needed for the account_management nesting.

Content improvements made along the way are kept: the "Customer
Contracts" title (no "Management"/"(Preview)" suffix), the Preview
caution box, the FAQ folded into the page body, and the Related docs
section.
…fix stale links, add missing Dash years

- Link to the new Multi-Tenant Usage Metering and Billing section from
  the topics list.
- Add Dash 2024, 2025, and 2026 to the Dash Conferences playlists
  block (each verified against the actual YouTube playlist/video
  before adding).
- Replace the dead Twitter link/label with X (twitter.com/datadoghq
  301-redirects to x.com/datadoghq).
- Add the DataDog/dpn repo (partner sample applications) to the
  GitHub repositories block.

Checked every other link on the page (GitHub repos, YouTube channel,
blog, LinkedIn, Facebook, status pages, release notes, partner
portal) - all resolve correctly, no further changes needed.
@lucarelli111 lucarelli111 removed the WORK IN PROGRESS No review needed, it's a wip ;) label Aug 29, 2026
@lucarelli111
lucarelli111 marked this pull request as ready for review August 29, 2026 01:03
@lucarelli111
lucarelli111 requested a review from a team as a code owner August 29, 2026 01:03
@ccwells
ccwells self-requested a review August 29, 2026 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Architecture Everything related to the Doc backend astro-reorg-processed Needs manual conflict resolution after replatforming reorg astro-reorg-skip Needs manual conflict resolution after replatforming reorg Images Images are added/removed with this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants