Skip to content

Commit

Permalink
Merge branch 'master' into aliciascott/DOCS-9319-NPM-name-change
Browse files Browse the repository at this point in the history
  • Loading branch information
aliciascott authored Nov 19, 2024
2 parents f9edaee + 7b18212 commit f975ee4
Show file tree
Hide file tree
Showing 140 changed files with 20,470 additions and 857 deletions.
6 changes: 3 additions & 3 deletions .ddev/ci/scripts/traces.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ def replay(*, record_file: str, port: int) -> None:
record = json.loads(line)
path = record['path']
body = b64decode(record['body'])

print(f'PUT {path} {len(body)} bytes: ', end='')
conn.request('PUT', path, body=body, headers=record['headers'])
print(conn.getresponse().read().decode('utf-8'))
response = conn.getresponse()
response.read() # Needs to be done to prevent ResponseNotReady.
print(response.status, response.reason)


def main():
Expand Down
14 changes: 10 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ manifest.json @DataDog/documentation @DataDog/agent-integrations
/kubernetes/ @DataDog/container-integrations @DataDog/agent-integrations
/kubernetes/*.md @DataDog/container-integrations @DataDog/agent-integrations @DataDog/documentation
/kubernetes/manifest.json @DataDog/container-integrations @DataDog/agent-integrations @DataDog/documentation
/kubernetes_admission/ @DataDog/container-platform @DataDog/agent-integrations
/kubernetes_cluster_autoscaler/ @DataDog/container-integrations @DataDog/agent-integrations
/kubernetes_cluster_autoscaler/*.md @DataDog/container-integrations @DataDog/agent-integrations @DataDog/documentation
/kubernetes_cluster_autoscaler/manifest.json @DataDog/container-integrations @DataDog/agent-integrations @DataDog/documentation
Expand Down Expand Up @@ -275,6 +276,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
/greenhouse/manifest.json @DataDog/saas-integrations @DataDog/documentation
/greenhouse/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend

/incident_io/ @DataDog/saas-integrations
/incident_io/*.md @DataDog/saas-integrations @DataDog/documentation
/incident_io/manifest.json @DataDog/saas-integrations @DataDog/documentation
/incident_io/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend

/lastpass/ @DataDog/saas-integrations
/lastpass/*.md @DataDog/saas-integrations @DataDog/documentation
/lastpass/manifest.json @DataDog/saas-integrations @DataDog/documentation
Expand Down Expand Up @@ -349,10 +355,10 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
/trend_micro_vision_one_endpoint_security/manifest.json @DataDog/saas-integrations @DataDog/documentation
/trend_micro_vision_one_endpoint_security/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend

hubspot_content_hub/ @DataDog/saas-integrations
hubspot_content_hub/*.md @DataDog/saas-integrations @DataDog/documentation
hubspot_content_hub/manifest.json @DataDog/saas-integrations @DataDog/documentation
hubspot_content_hub/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
/hubspot_content_hub/ @DataDog/saas-integrations
/hubspot_content_hub/*.md @DataDog/saas-integrations @DataDog/documentation
/hubspot_content_hub/manifest.json @DataDog/saas-integrations @DataDog/documentation
/hubspot_content_hub/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend


vonage/ @DataDog/saas-integrations
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-ddev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,9 @@ jobs:
- macos-packaging
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- name: Download Python artifacts
uses: actions/download-artifact@v4
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/build-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ jobs:
OUT_DIR: output/macos-x86_64
DD_PYTHON3: "/Library/Frameworks/Python.framework/Versions/3.12/bin/python"

permissions:
packages: write

steps:
- name: Set up environment
run: |-
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/config/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ integration/iis:
- iis/**/*
integration/impala:
- impala/**/*
integration/incident_io:
- incident_io/**/*
integration/istio:
- istio/**/*
integration/jboss_wildfly:
Expand Down Expand Up @@ -295,6 +297,8 @@ integration/kubelet:
- kubelet/**/*
integration/kubernetes:
- kubernetes/**/*
integration/kubernetes_admission:
- kubernetes_admission/**/*
integration/kubernetes_cluster_autoscaler:
- kubernetes_cluster_autoscaler/**/*
integration/kubernetes_state:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ jobs:
needs:
- build

permissions:
contents: write

steps:
- uses: actions/download-artifact@v4
with:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/pr-quick-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,19 @@ jobs:
- '*/changelog.d/*.removed'
- '*/changelog.d/*.major'
- name: Create token
uses: actions/create-github-app-token@v1
id: token-generator
with:
app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
repositories: integrations-core

- name: Comment
if: ${{ steps.changes.outputs.major_bump_fragments == 'true' }}
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ steps.token-generator.outputs.token }}
script: |
const { issue: { number: issue_number }, repo: { owner, repo } } = context;
github.rest.issues.createComment({ issue_number, owner, repo, body: "The changelog type `changed` or `removed` was used in this Pull Request, so the next release will bump major version. Please make sure this is a breaking change, or use the `fixed` or `added` type instead." });
4 changes: 3 additions & 1 deletion .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:

# Options
standard: true
test-py2: ${{ !matrix.python-support || contains(matrix.python-support, '2') }}
# We never test Python in integrations-core, but some partners may want to keep testing it
# in marketplace and integrations-extras.
test-py2: ${{ inputs.repo != 'core' && (!matrix.python-support || contains(matrix.python-support, '2')) }}
test-py3: ${{ !matrix.python-support || contains(matrix.python-support, '3') }}

# For other repositories
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release-hash-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ jobs:
build:
runs-on: ubuntu-latest

permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/run-validations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,20 @@ jobs:
if: inputs.codeowners
run: ddev validate codeowners

- name: Create token
uses: actions/create-github-app-token@v1
id: token-generator
with:
app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
repositories: integrations-core

- name: Comment PR on failure
if: ${{ failure() && github.event.pull_request.merged != true }}
uses: actions/github-script@v7
continue-on-error: true
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
github-token: ${{ steps.token-generator.outputs.token }}
script: |
const { issue: { number: issue_number }, repo: { owner, repo } } = context;
github.rest.issues.createComment({ issue_number, owner, repo, body: "The `validations` job has failed; please review the `Files changed` tab for possible suggestions to resolve." });
2 changes: 1 addition & 1 deletion .github/workflows/submit-traces.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
DD_HOSTNAME: "none"
DD_INSIDE_CI: "true"
DD_LOG_LEVEL: "trace"
DD_LOG_LEVEL: "warn"

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .in-toto/tag.ec45eb9d.link

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions AGENT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,14 @@
* Yarn [7.0.0](https://github.com/DataDog/integrations-core/blob/master/yarn/CHANGELOG.md) **BREAKING CHANGE**
* ZooKeeper [6.0.0](https://github.com/DataDog/integrations-core/blob/master/zk/CHANGELOG.md) **BREAKING CHANGE**

## Datadog Agent version [7.58.2](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7582)

* There were no integration updates for this version of the Agent.

## Datadog Agent version [7.58.1](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7581)

* There were no integration updates for this version of the Agent.

## Datadog Agent version [7.58.0](https://github.com/DataDog/datadog-agent/blob/master/CHANGELOG.rst#7580)

* Active Directory [3.0.0](https://github.com/DataDog/integrations-core/blob/master/active_directory/CHANGELOG.md) **BREAKING CHANGE**
Expand Down
Loading

0 comments on commit f975ee4

Please sign in to comment.