Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Datadog Integration Acceptance Tests / Bug fixes into release/1.2.x #3922

Draft
wants to merge 3 commits into
base: release/1.2.x
Choose a base branch
from

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3685 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@natemollica-nm
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • Introduce datadog integration acceptance testing with Datadog API
    • Consul Integration
    • DogstatsD (Unix Domain Sockets)
    • DogstatsD (UDP)
    • Openmetrics Prometheus
    • OTLP Collection Integration (HTTP)
    • OTLP Collection Integration (gRPC)
  • Fix some bugs surrounding the Openmetrics and Consul Integration Checks
    • Consul Checks also require prometheus.io annotations to be removed while enabled to avoid conflicts w/ dd-agent
    • Fix Openmetrics and Consul Integration check URLs to use consul.fullname-server helper template for accurate consul API access
    • Fix OTLP collection for telemetry-collector-deployment.yaml to include OTEL_EXPORTER_OTLP_ENDPOINT env variable for proper Datadog tag ingestion

How I've tested this PR

  • Ran: make bats-test for templating updates
  • Ran acceptance tests for new Datadog framework and test scenarios following CONTRIBUTING.md guide.

How I expect reviewers to test this PR

  • Review acceptance tests and see if they're worth even having in the repository. They add a few more go dependencies for Datadog client API access
    • The tests access the datadog agent's local API with datadog dogstatsd stats enabled to parse metrics output from the collection event.
    • This testing leverages the Datadog fake-intake image to simulate traffic ingestion and remove the requirement to have to use an API and APP key.

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/natemollica-nm/datadog-acceptance-testing/internally-charming-cowbird branch from bc123e5 to d2e7704 Compare April 19, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants