From 48916702d7d249c73df7d6361626475fda0b7bbb Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Tue, 27 May 2025 17:13:02 -0400 Subject: [PATCH 1/9] initial Signed-off-by: Brian Deutsch --- Makefile | 1 - go.mod | 2 +- go.sum | 4 +- .../configurations/pull_config_preview.yaml | 128 +++++++++--------- 4 files changed, 67 insertions(+), 68 deletions(-) diff --git a/Makefile b/Makefile index 3eafade0115ab..e453a5fc79a25 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,6 @@ build-cdocs: 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) diff --git a/go.mod b/go.mod index f7b6da75ba80d..f1d3ed777e7dd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250416175658-6e7c09b9db13 // indirect + github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084 // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index bf09b4bac60b6..4328e989be84c 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ github.com/DataDog/websites-modules v1.4.229 h1:m3j/ogyAx1SnaX3h7zN1ohK54KxVOPrPj4pDWcqaZA0= github.com/DataDog/websites-modules v1.4.229/go.mod h1:CcQxAmCXoiFr3hNw6Q+1si65C3uOP1gB+7aX4S3h+CQ= -github.com/DataDog/websites-sources v0.0.0-20250416175658-6e7c09b9db13 h1:ssCEdgE8z9TpgbD82hAuOqIyessYOSYkxN24j+FFrmA= -github.com/DataDog/websites-sources v0.0.0-20250416175658-6e7c09b9db13/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084 h1:fm2rtCZTy4mwDDPAZpQqIeYCQDZQ4w7iazQzhbBNEsU= +github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= diff --git a/local/bin/py/build/configurations/pull_config_preview.yaml b/local/bin/py/build/configurations/pull_config_preview.yaml index 18333e0da5dd9..318fc60771772 100644 --- a/local/bin/py/build/configurations/pull_config_preview.yaml +++ b/local/bin/py/build/configurations/pull_config_preview.yaml @@ -3,31 +3,31 @@ - org_name: jenkinsci repos: - - repo_name: datadog-plugin + # - repo_name: datadog-plugin - contents: + # contents: - - action: pull-and-push-file - branch: master - globs: - - README.md - options: - dest_path: '/integrations/' - file_name: 'jenkins.md' - front_matters: - dependencies: ["https://github.com/jenkinsci/datadog-plugin/blob/master/README.md"] - public_title: Datadog-Jenkins Integration - custom_kind: integration - name: jenkins - is_public: true - integration_title: Jenkins - has_logo: true - git_integration_title: jenkins - description: "Automatically forward your Jenkins metrics, events, and service checks to Datadog." - short_description: "Automatically forward your Jenkins metrics, events, and service checks to Datadog." - categories: - - "configuration & deployment" - doc_link: https://docs.datadoghq.com/integrations/jenkins/ + # - action: pull-and-push-file + # branch: master + # globs: + # - README.md + # options: + # dest_path: '/integrations/' + # file_name: 'jenkins.md' + # front_matters: + # dependencies: ["https://github.com/jenkinsci/datadog-plugin/blob/master/README.md"] + # public_title: Datadog-Jenkins Integration + # custom_kind: integration + # name: jenkins + # is_public: true + # integration_title: Jenkins + # has_logo: true + # git_integration_title: jenkins + # description: "Automatically forward your Jenkins metrics, events, and service checks to Datadog." + # short_description: "Automatically forward your Jenkins metrics, events, and service checks to Datadog." + # categories: + # - "configuration & deployment" + # doc_link: https://docs.datadoghq.com/integrations/jenkins/ - org_name: ansible-collections @@ -74,55 +74,55 @@ # https://github.com/DataDog/dd-go/blob/prod/networks/model/domain/azure_services.go - networks/model/domain/azure_services.go - - repo_name: dogweb + # - repo_name: dogweb - contents: + # contents: - - action: integrations - branch: prod - globs: - - integration/*/*_metadata.csv - - integration/*/manifest.json - - integration/*/service_checks.json - - integration/*/README.md - - integration/*/__init__.py + # - action: integrations + # branch: prod + # globs: + # - integration/*/*_metadata.csv + # - integration/*/manifest.json + # - integration/*/service_checks.json + # - integration/*/README.md + # - integration/*/__init__.py - - repo_name: integrations-core - contents: + # - repo_name: integrations-core + # contents: - - action: integrations - branch: master - globs: - - "*/metadata.csv" - - "*/manifest.json" - - "*/assets/service_checks.json" - - "*/README.md" - - "*/datadog_checks/*/__about__.py" + # - action: integrations + # branch: master + # globs: + # - "*/metadata.csv" + # - "*/manifest.json" + # - "*/assets/service_checks.json" + # - "*/README.md" + # - "*/datadog_checks/*/__about__.py" - - repo_name: integrations-extras - contents: + # - repo_name: integrations-extras + # contents: - - action: integrations - branch: master - globs: - - "*/metadata.csv" - - "*/manifest.json" - - "*/assets/service_checks.json" - - "*/README.md" - - "*/datadog_checks/*/__about__.py" + # - action: integrations + # branch: master + # globs: + # - "*/metadata.csv" + # - "*/manifest.json" + # - "*/assets/service_checks.json" + # - "*/README.md" + # - "*/datadog_checks/*/__about__.py" - - repo_name: integrations-internal-core - contents: + # - repo_name: integrations-internal-core + # contents: - - action: integrations - branch: main - globs: - - "*/metadata.csv" - - "*/manifest.json" - - "*/assets/service_checks.json" - - "*/assets/metrics/metric-spec.yaml" - - "*/README.md" - - "*/datadog_checks/*/__about__.py" + # - action: integrations + # branch: main + # globs: + # - "*/metadata.csv" + # - "*/manifest.json" + # - "*/assets/service_checks.json" + # - "*/assets/metrics/metric-spec.yaml" + # - "*/README.md" + # - "*/datadog_checks/*/__about__.py" # - repo_name: marketplace # contents: From 3e2b63396408247989762b21f4f85e99ee9a5113 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Tue, 27 May 2025 20:19:47 -0400 Subject: [PATCH 2/9] fix Signed-off-by: Brian Deutsch --- local/bin/py/build/configurations/pull_config_preview.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local/bin/py/build/configurations/pull_config_preview.yaml b/local/bin/py/build/configurations/pull_config_preview.yaml index 318fc60771772..bae6fddfa8b42 100644 --- a/local/bin/py/build/configurations/pull_config_preview.yaml +++ b/local/bin/py/build/configurations/pull_config_preview.yaml @@ -1,8 +1,8 @@ --- - data: - - org_name: jenkinsci + # - org_name: jenkinsci - repos: + # repos: # - repo_name: datadog-plugin # contents: From 8589f43105240709b47bfe96249ced00dae43a94 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Wed, 28 May 2025 16:18:03 -0400 Subject: [PATCH 3/9] update Signed-off-by: Brian Deutsch --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index e453a5fc79a25..74057a3565e7f 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,6 @@ start-no-pre-build: node_modules ## Build and run docs excluding external conte # 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 From 7448fa0cc6ee341513b2d92884ecd406454dde98 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Wed, 28 May 2025 16:32:20 -0400 Subject: [PATCH 4/9] dont get the latest sources for now Signed-off-by: Brian Deutsch --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 74057a3565e7f..7c6fa0c7251af 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,7 @@ build-cdocs: 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) @@ -81,6 +82,7 @@ start-no-pre-build: node_modules ## Build and run docs excluding external conte # 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 @@ -145,9 +147,6 @@ config: # Automatically download the latest module from websites-sources repo update_websites_sources_module: - node_modules/hugo-bin/vendor/hugo mod get github.com/DataDog/websites-sources@main - node_modules/hugo-bin/vendor/hugo mod clean - node_modules/hugo-bin/vendor/hugo mod tidy cat go.mod ####################################################################################################################### # API Code Examples From 0b99620d26b8175bbfc6f995f7eb466b1c382b32 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Fri, 30 May 2025 12:53:49 -0400 Subject: [PATCH 5/9] update sources ref Signed-off-by: Brian Deutsch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f1d3ed777e7dd..6e62e44da0b47 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084 // indirect + github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531 // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index 4328e989be84c..3dd025e181fe2 100644 --- a/go.sum +++ b/go.sum @@ -2,3 +2,5 @@ github.com/DataDog/websites-modules v1.4.229 h1:m3j/ogyAx1SnaX3h7zN1ohK54KxVOPrP github.com/DataDog/websites-modules v1.4.229/go.mod h1:CcQxAmCXoiFr3hNw6Q+1si65C3uOP1gB+7aX4S3h+CQ= github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084 h1:fm2rtCZTy4mwDDPAZpQqIeYCQDZQ4w7iazQzhbBNEsU= github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531 h1:eKj7k+/ZqsjMka7p3z/C9XaZtbucO85tWYB/ln/ZiqY= +github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= From c2539a105b22336147a48c7a79743eeefe7000ad Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Fri, 30 May 2025 14:14:56 -0400 Subject: [PATCH 6/9] sources ref Signed-off-by: Brian Deutsch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e62e44da0b47..7483cc6df6534 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531 // indirect + github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index 3dd025e181fe2..c86e072ca6a26 100644 --- a/go.sum +++ b/go.sum @@ -4,3 +4,5 @@ github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084 h1:fm2rtC github.com/DataDog/websites-sources v0.0.0-20250527204404-64c5172a7084/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531 h1:eKj7k+/ZqsjMka7p3z/C9XaZtbucO85tWYB/ln/ZiqY= github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b h1:t4WXtleM8JBJmjxuzEzKbOncaCSSF+LAcPuPaNQtICU= +github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= From 2a11b69e3c01642ff1c24eae9982407a1f39fb39 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Mon, 2 Jun 2025 16:38:55 -0400 Subject: [PATCH 7/9] update source ref Signed-off-by: Brian Deutsch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7483cc6df6534..95b1c6386589a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b // indirect + github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433 // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index c86e072ca6a26..431c022421acd 100644 --- a/go.sum +++ b/go.sum @@ -6,3 +6,5 @@ github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531 h1:eKj7k+ github.com/DataDog/websites-sources v0.0.0-20250530164735-428a343bc531/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b h1:t4WXtleM8JBJmjxuzEzKbOncaCSSF+LAcPuPaNQtICU= github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433 h1:Fsx7WwwTL3pd9Z0/M3WZXXoPH2JWms1HJpuX6K35xYk= +github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= From 719a8e8768f6291d4967e03dc827548b273c077b Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Tue, 3 Jun 2025 16:41:36 -0400 Subject: [PATCH 8/9] update sources ref Signed-off-by: Brian Deutsch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 95b1c6386589a..892e25e1bb4dc 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433 // indirect + github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35 // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index 431c022421acd..8feb310b547d9 100644 --- a/go.sum +++ b/go.sum @@ -8,3 +8,5 @@ github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b h1:t4WXtl github.com/DataDog/websites-sources v0.0.0-20250530181203-97d3892e641b/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433 h1:Fsx7WwwTL3pd9Z0/M3WZXXoPH2JWms1HJpuX6K35xYk= github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35 h1:SheinDQaM2OLxEdCUNchvTVdEHp4FcvbShY3PjTs3Xc= +github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= From 57dcc2d70adf6c27b3bc1f63b9f90f6c4520bce4 Mon Sep 17 00:00:00 2001 From: Brian Deutsch Date: Wed, 4 Jun 2025 19:29:28 -0400 Subject: [PATCH 9/9] get latest Signed-off-by: Brian Deutsch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 892e25e1bb4dc..9aa2aac035f65 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/DataDog/websites-modules v1.4.229 // indirect - github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35 // indirect + github.com/DataDog/websites-sources v0.0.0-20250604232349-f7ff10a194f0 // indirect ) // replace github.com/DataDog/websites-modules => /Users/lisiane.turlure/guac/websites-modules diff --git a/go.sum b/go.sum index 8feb310b547d9..085be151c9603 100644 --- a/go.sum +++ b/go.sum @@ -10,3 +10,5 @@ github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433 h1:Fsx7Ww github.com/DataDog/websites-sources v0.0.0-20250602200419-0e42ce935433/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35 h1:SheinDQaM2OLxEdCUNchvTVdEHp4FcvbShY3PjTs3Xc= github.com/DataDog/websites-sources v0.0.0-20250603203822-19b49b3d8e35/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs= +github.com/DataDog/websites-sources v0.0.0-20250604232349-f7ff10a194f0 h1:0DyMTgo7aNCfnC6AzIAF6mr34xMBPOCG9yJY7AucEeo= +github.com/DataDog/websites-sources v0.0.0-20250604232349-f7ff10a194f0/go.mod h1:RvGhXV0uQC6Ocs+n84QyL97kows6vg6VG5ZLQMHw4Fs=