Skip to content
Open
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
15 changes: 9 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SHELL = /bin/bash
# MAKEFLAGS := --jobs=$(shell nproc)
# MAKEFLAGS += --output-sync --no-print-directory
.PHONY: help clean-all clean start-preserve-build dependencies server start start-no-pre-build start-docker stop-docker all-examples clean-examples placeholders update_pre_build config derefs vector_data
.PHONY: help clean-all clean start-preserve-build dependencies server start start-no-pre-build start-docker stop-docker all-examples clean-examples placeholders update_pre_build config derefs vector_data websites_sources_data
.DEFAULT_GOAL := help
PY3=$(shell if [ `which pyenv` ]; then \
if [ `pyenv which python3` ]; then \
Expand Down Expand Up @@ -35,7 +35,7 @@ help:
@perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-25s\033[0m %s\n", $$1, $$2}'

clean-all: clean clean-examples clean-dependent-repos clean-build-scripts ## Clean everything (environment, sourced repos, generated files, build scripts)
rm -rf ./node_modules ./hugpython ./public
rm -rf ./node_modules ./hugpython ./public ./_vendor

clean-dependent-repos:
rm -rf ./integrations_data
Expand Down Expand Up @@ -81,20 +81,18 @@ build-llms-txt:
start:
@make setup-build-scripts ## Build and run docs including external content.
@make dependencies
@make update_websites_sources_module
@make server

# Skip downloading any dependencies and run the site (hugo needs at the least node)
start-no-pre-build: node_modules ## Build and run docs excluding external content.
@make setup-build-scripts
@make update_websites_sources_module
@make websites_sources_data
Copy link
Contributor

@StefonSimmons StefonSimmons Aug 28, 2025

Choose a reason for hiding this comment

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

do we also want to get data from s3 on make start and start-preserve-build too?

@make build-cdocs
@make server

# Leave build scripts as is for local testing
# This is useful for testing changes to the build scripts locally
start-preserve-build: dependencies
@make update_websites_sources_module
@make server

# Leave build scripts in place, but skip dependencies and sources_module
Expand Down Expand Up @@ -123,7 +121,12 @@ node_modules: package.json yarn.lock

# All the requirements for a full build
dependencies: clean
make hugpython all-examples update_pre_build node_modules build-cdocs build-llms-txt
make hugpython all-examples update_pre_build node_modules build-cdocs websites_sources_data build-llms-txt

# Download files from S3 bucket and add them to the file system
websites_sources_data: hugpython
@echo "Downloading data from websites-sources S3 bucket..."
@. hugpython/bin/activate && python3 ./local/bin/py/build/get_websites_sources_data.py

integrations_data/extracted/vector:
$(call source_repo,vector,https://github.com/vectordotdev/vector.git,master,true,website/)
Expand Down
39 changes: 24 additions & 15 deletions config/_default/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@ module:
- source: i18n
target: i18n

- path: github.com/DataDog/websites-sources
disabled: false
mounts:
- source: content/en/integrations
target: content/integrations
lang: en
- source: content/en/security/code_security/iac_security/iac_rules
target: content/security/code_security/iac_security/iac_rules
lang: en
- source: data
target: data
- source: assets
target: assets
- source: layouts/shortcodes
target: layouts/shortcodes
# - path: github.com/DataDog/websites-sources
# disabled: true
# mounts:
# - source: content/en/integrations
# target: content/integrations
# lang: en
# - source: content/en/security/code_security/iac_security/iac_rules
# target: content/security/code_security/iac_security/iac_rules
# lang: en
# - source: data
# target: data
# - source: assets
# target: assets
# - source: layouts/shortcodes
# target: layouts/shortcodes

mounts:
# default mounts
Expand Down Expand Up @@ -146,6 +146,15 @@ module:
target: "assets/node_modules/datadog-rum.js"
- source: "./node_modules/@datadog/browser-logs/bundle/datadog-logs.js"
target: "assets/node_modules/datadog-logs.js"
- source: _vendor/content/en
target: content
lang: en
- source: _vendor/data
target: data
- source: _vendor/layouts
target: layouts
- source: _vendor/assets
target: assets

security:
funcs:
Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ go 1.24.4

require (
github.com/DataDog/websites-modules v1.4.253 // indirect
github.com/DataDog/websites-sources v0.0.0-20250826202848-b1166170e449 // indirect
)

// replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules
// replace github.com/DataDog/websites-sources => /Users/brian.deutsch/dd/websites-sources
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
github.com/DataDog/websites-modules v1.4.253 h1:Sd+5ILFUVOyagh3oUMyc0onM7bykJy0asO9ObLgx4ms=
github.com/DataDog/websites-modules v1.4.253/go.mod h1:CcQxAmCXoiFr3hNw6Q+1si65C3uOP1gB+7aX4S3h+CQ=
github.com/DataDog/websites-sources v0.0.0-20250826202848-b1166170e449 h1:7/gA9fYaZJT+GE7HnI7u7gKn+arQPKVy5EdGqAFVazs=
github.com/DataDog/websites-sources v0.0.0-20250826202848-b1166170e449/go.mod h1:DlDYkYoR/nhKYRur0+2jmGGc7ydk8Q0ybWkS6oaLVuo=
15 changes: 0 additions & 15 deletions local/bin/py/build/configurations/pull_config_preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,6 @@
# https://github.com/DataDog/dd-go/blob/prod/networks/model/domain/azure_services.go
- networks/model/domain/azure_services.go

# Some dogweb integrations are not migrated to APW yet, this is here for reviewing upstream changes locally.
# Please don't add this to pull_config.yaml / production.
- repo_name: dogweb

contents:

- action: integrations
branch: prod
globs:
- integration/*/*_metadata.csv
- integration/*/manifest.json
- integration/*/service_checks.json
- integration/*/README.md
- integration/*/__init__.py

- repo_name: ansible-datadog
contents:

Expand Down
Loading