Skip to content

[pull] master from DataDog:master#507

Merged
pull[bot] merged 9 commits into
ConnectionMaster:masterfrom
DataDog:master
Apr 28, 2026
Merged

[pull] master from DataDog:master#507
pull[bot] merged 9 commits into
ConnectionMaster:masterfrom
DataDog:master

Conversation

@pull

@pull pull Bot commented Apr 28, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

bskinny and others added 9 commits April 28, 2026 14:50
…tion (#23315)

* PingOne Advanced Identity Cloud: No assets, initial definition

* Update labeler.yml with ping_one_aic

* Apply suggestion from @urseberry

Co-authored-by: Ursula Chen <58821586+urseberry@users.noreply.github.com>

* PingOne Advanced Identity Cloud: Fix FQDN example value

---------

Co-authored-by: Ursula Chen <58821586+urseberry@users.noreply.github.com>
Co-authored-by: Bo Huang <bo.huang@datadoghq.com>
)

* Remove stale dependabot references from GitHub Actions workflows

* Update dependency resolution

---------

Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
* Bump lxml from 6.0.1 to 6.1.0

Addresses CVE-2026-41066.

* Update dependency resolution

---------

Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
* Expand statement metrics columns collected

* Update metric metadata

* Add changelog

* update unit typw
)

* Add ddev release changelog build to preview generated changelog

* Add changelog entry

* Centralize towncrier invocation and pin output encoding

- Reuse the shared towncrier() helper from datadog_checks_dev instead of
  re-implementing the subprocess invocation in build.py.
- Add a return_output kwarg to the helper so callers that need to format
  or persist the captured stdout can opt out of the auto-echo.
- Switch build.py to ddev.utils.fs.Path and emit via app.display(markup=False)
  so the changelog markdown link brackets survive rendering.
- Pin --file output to utf-8 so non-ASCII fragment content is not corrupted
  on platforms where the default encoding is not utf-8.

* Rename helper kwarg back to quiet and annotate return type

* Move towncrier wrapper into ddev and drop the datadog_checks_dev import

- Add ddev/src/ddev/cli/release/changelog/towncrier.py: a small ddev-native
  wrapper around towncrier that runs through app.platform.run_command,
  aborts on non-zero via app.abort, and renders captured stdout via
  app.display(markup=False) by default.
- new and build now use the new wrapper instead of importing the helper
  from datadog_checks_dev.
- Revert the datadog_checks_dev towncrier helper to its pre-PR shape; ddev
  no longer needs the quiet kwarg there.

* Apply review feedback for changelog build

- Fall back to a default error message when towncrier exits non-zero with
  empty stdout/stderr.
- Replace the list comprehension in build with a plain loop; subprocess
  invocations with side effects read better as explicit iteration.
- Validate all targets up front and abort once with the full list of
  unknown names.
- Auto-create the parent of --file so writing to a path inside a
  non-existent directory does not raise FileNotFoundError.
- Extract _reset_fragments_dir helper used by the build_fragments fixture,
  setup_changelog_build, and the multi-target test.
- Add a test that asserts towncrier renders 'No significant changes' when
  changelog.d is empty.
- Move import subprocess to module scope in the test file.

* Make towncrier failures show stdout, then a clear exit message and stderr

Previously the abort path mashed stdout and stderr together (or fell back to
a generic message), so the user never explicitly saw that towncrier had
failed when it produced any output. Now the wrapper:

- Always echoes towncrier stdout when there is something to show or when
  towncrier failed, so the user sees the rendered output / partial progress.
- On non-zero exit, follows that with "towncrier <cmd> exited with code N"
  and the captured stderr, so the failure mode is unambiguous.

* Rename release changelog build to draft

The command is purely a preview - it never writes CHANGELOG.md or
consumes fragments - so 'draft' describes its semantics more honestly
than 'build'. It also avoids two name collisions: with 'ddev release
build' (which builds wheels) and with the natural future use of
'ddev release changelog build' (a user-facing wrapper for the legacy
release-make changelog generator that does mutate CHANGELOG.md).

The new test file lives at ddev/tests/cli/release/changelog/test_draft.py.
The shared towncrier setup (the repo_with_towncrier fixture and a
reset_fragments_dir helper) moves to ddev/tests/cli/release/conftest.py
so both test_draft.py and the existing test_changelog.py can use it.

* Move reset_fragments_dir to tests.helpers.changelog

Importing from a conftest module is discouraged by pytest. The helper
belongs in tests/helpers, alongside the other shared test utilities.
The repo_with_towncrier fixture stays in cli/release/conftest.py since
fixtures are auto-discovered, not imported.
* Wait for spark executors to register before tests

* Wait for executor on either app, not both (single core)
* [AI-6669] Add NiFi log pipeline, assets, manifest, and dashboard

Rebased onto master now that the AI-6668 implementation is merged. This PR completes the integration tile by adding assets the implementation PR deliberately left out of scope.

Adds:
- `manifest.json` with metrics, events, logs, dashboard, saved views
- `assets/dashboards/nifi_overview.json` overview dashboard
- `assets/dataflows.yaml` declaring nifi-metrics, nifi-events, nifi-logs
- `assets/logs/nifi.yaml` pipeline with nested sub-pipelines for app logs and Combined Log Format request logs
- `assets/logs/nifi_tests.yaml` with 5 pipeline test cases
- `assets/saved_views/` for error logs and HTTP access logs
- `images/IMAGES_README.md` media gallery guide
- Log config entries in `spec.yaml` and `conf.yaml.example` for all four NiFi log files (app, user, bootstrap, request)
- README log collection section with multiline stack trace guidance

Drops the earlier `service_checks.json` and its manifest reference — the check only emits the `nifi.can_connect` gauge, not a service check, so the README already documents connectivity there.

* Update dependency resolution

* Address review feedback on NiFi dashboard and saved view

- Fix GC widget query to use `sum:...as_rate()` for correct rate semantics
  on the monotonic_count metric (was `avg:` which misrepresents the rate).
- Expand the overview dashboard to cover cluster health, bytes queued,
  processor status breakdown, and top connections by backpressure, so the
  dashboard reflects the full scope the check advertises.
- Fix the error-logs saved view query: include `warning` status so 4xx
  HTTP request logs (tagged `status:warning` by the pipeline) surface too.

* Fix CI validation failures for NiFi log pipeline

- Add missing standard attribute facets (URL host/port/scheme,
  useragent browser/device/os families) and fix sort order
- Update request log test expectations to match actual pipeline
  user-agent parser output
- Add changelog entry for PR #23302

* Remove dashboard, manifest, and images from repo

These assets belong in Developer Platform, not integrations-core.

---------

Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
Co-authored-by: dkirov-dd <166512750+dkirov-dd@users.noreply.github.com>
@pull pull Bot locked and limited conversation to collaborators Apr 28, 2026
@pull pull Bot added the ⤵️ pull label Apr 28, 2026
@pull pull Bot merged commit d4c02f3 into ConnectionMaster:master Apr 28, 2026
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants