Skip to content

Commit

Permalink
Merge branch 'master' into mcretzman/DOCS-9310-asm-signals-exp-update
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelcretzman authored Oct 28, 2024
2 parents 1b29142 + eba04da commit d2357fc
Show file tree
Hide file tree
Showing 317 changed files with 16,157 additions and 3,190 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-23 10:09:52.136918",
"spec_repo_commit": "df3187ca"
"regenerated": "2024-10-28 18:38:56.326868",
"spec_repo_commit": "b4ad1786"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-10-23 10:09:59.906530",
"spec_repo_commit": "df3187ca"
"regenerated": "2024-10-28 18:39:04.239857",
"spec_repo_commit": "b4ad1786"
}
}
}
8 changes: 6 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
### Merge instructions
<!-- If you want us to merge this PR as soon as we've reviewed, check the box below. If you're waiting for a release or there are other considerations that you want us to be aware of, list them below. -->

- [ ] Please merge after reviewing
Merge queue is enabled in this repo. To have it automatically merged after it receives the required reviews, create the PR (from a branch that follows the `<yourname>/description` naming convention) and then add the following PR comment:

```
/merge
```

### Additional notes
<!-- Anything else we should know when reviewing?-->

<!-- Previewing the PR: Assuming you are a Datadog employee and named your branch `<yourname>/<description>`, a preview build will run and links to the preview output will be auto-generated and posted in the PR comments. The links will 404 until the preview build is finished running. -->
<!-- Previewing the PR: Assuming you are a Datadog employee and named your branch `<yourname>/<description>`, a preview build will run and links to the preview output will be auto-generated and posted in the PR comments. The links will 404 until the preview build is finished running. -->
1 change: 1 addition & 0 deletions .github/workflows/check_cache_values.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ concurrency:

jobs:
check-cache-values:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/codeowner_review_status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ on:

permissions: {}

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
check-code-owners-approval:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ permissions:

jobs:
static-analysis:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
name: Datadog Static Analyzer
steps:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/gif_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ on:
paths:
- 'static/images/**/*'

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
look-for-gifs:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
repo-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Set documentation preview
if: github.event.pull_request.head.repo.fork == false
if: github.event.pull_request.head.repo.fork == false && github.ref != 'refs/heads/guacbot/translation-pipeline'
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/merge_label_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ permissions:
contents: read
pull-requests: read

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
new-check-for-merge-label:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
name: "Merge is not allowed when 'Do Not Merge' label is present"
steps:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/preview_link.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ permissions:
contents: read
pull-requests: write

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
preview-link:
if: contains(github.head_ref, '/')
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/synthetics.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Preview Synthetics
on: [pull_request]
on:
pull_request:
types: [opened, synchronize]
branches:
- master
workflow_dispatch: # allows manual trigger

# Stop the current running job if a new push is made to the PR
concurrency:
Expand All @@ -11,6 +16,7 @@ permissions:

jobs:
synthetic_testing:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/vale_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ on:
permissions:
contents: read

# Stop the current running job if a new push is made to the PR
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
vale:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/validate_filenames.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ permissions:

jobs:
run_static_asset_validation:
if: github.ref != 'refs/heads/guacbot/translation-pipeline'
runs-on: ubuntu-latest
steps:

Expand Down
31 changes: 16 additions & 15 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,21 +339,22 @@ algolia_sync_live:
CI_PIPELINE_SOURCE=$CI_PIPELINE_SOURCE
yarn run algolia:sync
#typesense_sync_live:
# <<: *base_template
# <<: *live_rules
# stage: post-deploy
# environment: "live"
# allow_failure: true
# interruptible: true
# timeout: 2h
# dependencies:
# - build_live
# script:
# - >
# TYPESENSE_ADMIN_API_KEY=$(get_secret 'typesense_prod_admin_api_key')
# TYPESENSE_HOST=$(get_secret 'typesense_prod_host')
# yarn run typesense:sync
typesense_sync_live:
<<: *base_template
<<: *live_rules
stage: post-deploy
environment: "live"
allow_failure: true
interruptible: true
timeout: 2h
dependencies:
- build_live
script:
- yarn add typesense-sync@https://s3.amazonaws.com/origin-static-assets/corp-node-packages/master/typesense-sync-v1.0.4.tgz
- >
TYPESENSE_ADMIN_API_KEY=$(get_secret 'typesense_prod_admin_api_key')
TYPESENSE_HOST=$(get_secret 'typesense_prod_host')
yarn run typesense:sync
sourcemaps_preview:
<<: *base_template
Expand Down
5 changes: 5 additions & 0 deletions config/_default/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ outputFormats:
isPlainText: true
mediaType: "application/json"
notAlternative: true
Search:
baseName: "search"
isPlainText: true
mediaType: "application/json"
notAlternative: true
Redirects:
baseName: "redirects"
isPlainText: true
Expand Down
1 change: 1 addition & 0 deletions config/_default/languages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ en:
- HTML
- RSS
- Algolia
- Search
- Redirects
page:
- HTML
Expand Down
58 changes: 34 additions & 24 deletions config/_default/menus/main.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1321,9 +1321,9 @@ menu:
url: dashboards/sharing/
parent: dashboards
weight: 10
- name: Public Dashboards
identifier: dashboards_sharing_public_dashboards
url: dashboards/sharing/public_dashboards
- name: Shared Dashboards
identifier: dashboards_sharing_shared_dashboards
url: dashboards/sharing/shared_dashboards
parent: dashboards_sharing
weight: 1001
- name: Share Graphs
Expand Down Expand Up @@ -2134,11 +2134,16 @@ menu:
parent: incidents
identifier: incident_notification
weight: 3
- name: Incident Details
url: service_management/incident_management/incident_details
- name: Investigate an Incident
url: service_management/incident_management/investigate
parent: incidents
identifier: incident_details
identifier: incident_investigate
weight: 4
- name: Timeline
url: service_management/incident_management/investigate/timeline
parent: incident_investigate
identifier: incident_investigate_timeline
weight: 401
- name: Incident Settings
url: service_management/incident_management/incident_settings
parent: incidents
Expand Down Expand Up @@ -3968,7 +3973,7 @@ menu:
url: llm_observability/configuration/
parent: llm_obs
identifier: llm_obs_configuration
weight: 4
weight: 4
- name: Submit Evaluations
url: llm_observability/submit_evaluations/
parent: llm_obs
Expand Down Expand Up @@ -4952,70 +4957,70 @@ menu:
parent: observability_pipelines
identifier: observability_pipelines_processors
weight: 7
- name: Add Environment Variables
url: observability_pipelines/processors/add_environment_variables
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_add_environment_variables
weight: 701
- name: Add hostname
url: observability_pipelines/processors/add_hostname
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_add_hostname
weight: 701
weight: 702
- name: Deduplicate
url: observability_pipelines/processors/dedupe
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_dedupe
weight: 702
weight: 703
- name: Edit fields
url: observability_pipelines/processors/edit_fields
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_edit_fields
weight: 703
weight: 704
- name: Enrichment Table
url: observability_pipelines/processors/enrichment_table
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_enrichment_table
weight: 704
weight: 705
- name: Filter
url: observability_pipelines/processors/filter
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_filter
weight: 705
weight: 706
- name: Generate Metrics
url: observability_pipelines/processors/generate_metrics
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_generate_metrics
weight: 706
weight: 707
- name: Grok Parser
url: observability_pipelines/processors/grok_parser
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_grok_parser
weight: 707
weight: 708
- name: Parse JSON
url: observability_pipelines/processors/parse_json
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_parse_json
weight: 708
weight: 709
- name: Quota
url: observability_pipelines/processors/quota
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_quota
weight: 709
weight: 710
- name: Reduce
url: observability_pipelines/processors/reduce
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_reduce
weight: 710
weight: 711
- name: Sample
url: observability_pipelines/processors/sample
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_sample
weight: 711
weight: 712
- name: Sensitive Data Scanner
url: observability_pipelines/processors/sensitive_data_scanner
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_sensitive_data_scanner
weight: 712
- name: Set Environment Variables
url: observability_pipelines/processors/set_environment_variables
parent: observability_pipelines_processors
identifier: observability_pipelines_processors_set_environment_variables
weight: 713
- name: Destinations
url: observability_pipelines/destinations/
Expand Down Expand Up @@ -5158,7 +5163,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 110
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down Expand Up @@ -5344,6 +5349,11 @@ menu:
parent: log_management
identifier: logs_workspaces
weight: 6
- name: Time Selection
url: logs/workspaces/time_selection/
parent: logs_workspaces
identifier: logs_workspaces_time_selection
weight: 601
- name: Error Tracking
url: logs/error_tracking/
parent: log_management
Expand Down
2 changes: 1 addition & 1 deletion config/_default/menus/main.fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4797,7 +4797,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 109
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down
2 changes: 1 addition & 1 deletion config/_default/menus/main.ja.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4797,7 +4797,7 @@ menu:
parent: log_collection
identifier: log_collection_java
weight: 109
- name: NodeJS
- name: Node.js
identifier: log_collection_nodejs
url: logs/log_collection/nodejs/
parent: log_collection
Expand Down
Loading

0 comments on commit d2357fc

Please sign in to comment.