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 into release/1.2.x (cherry-pick) #3626

Conversation

natemollica-nm
Copy link
Contributor

Backport

This PR is manually generated from #3407 to be assessed for back porting due to the inclusion of the label backport/1.2.x and failure of auto-back porting.

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


Changes proposed in this PR

PR Resubmitted from Branch vice Fork for Automation Testing

  • Expose several metrics specific features on consul-k8s to include:
  • Introduce a means to ease the integration and operation of integrating with Datadog Agent metrics collection via fail-safe helm override value parameters. Overrides are intended to allow operators to easily configure 1 of the 3 following methods of monitoring Consul with Datadog on Kubernetes:
    • DogStatsD via one of either "UDP" or "UDS" transport protocols
    • OpenMetrics via Datadogs Autodiscovery feature to scrape the /v1/agent/metrics?format=prometheus endpoint
    • Datadog + Consul Integration Feature standard checks:
      • Serf events and member flaps
      • The Raft protocol
      • DNS performance
      • API Endpoints Health Checks:
        • /v1/agent/metrics?format=prometheus
        • /v1/agent/self
        • /v1/status/leader
        • /v1/status/peers
        • /v1/catalog/services
        • /v1/health/service
        • /v1/health/state/any
        • /v1/coordinate/datacenters
        • /v1/coordinate/nodes
  • Introduces server-acl-init token creation for OpenMetrics and Datadog Consul Integration check methods allowing default minimal acl token permission generation for Datadog agent usage as necessary.

How I've tested this PR

  • New ACL Token Testing as outline in the CONTRIBUTING.md steps.
  • Deployment and testing of local consul-dev (main) and consul-k8s-control-plane-dev (datadog-integration branch) images on k3d test cluster for each scenario. Test repository here.
  • Verification of helm templating for new value overrides added as instructed in CONTRIBUTING.md steps. bats ./charts/consul/test/unit --jobs 8 - ran successfully for all tests.

How I expect reviewers to test this PR

  • Assess the need for additional unit testing creation and verification.
  • If possible:
    • Reach out with any question/concerns or reasons for PR push-back.
    • Verification of fail-safe interlocks between the 3 methods of integration mentioned above.
    • Verification of ACL policy implementation.

Checklist


Overview of commits

@natemollica-nm natemollica-nm added the pr/no-backport signals that a PR will not contain a backport label label Feb 13, 2024
@natemollica-nm natemollica-nm force-pushed the backport/natemollica-nm/datadog-integration/manual-cherry-pick-1-2-x branch from 61aae0b to e157dce Compare February 13, 2024 23:25
@natemollica-nm natemollica-nm force-pushed the backport/natemollica-nm/datadog-integration/manual-cherry-pick-1-2-x branch from e157dce to 8c3d291 Compare February 14, 2024 16:22
Copy link
Contributor

@curtbushko curtbushko left a comment

Choose a reason for hiding this comment

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

LGTM!

@natemollica-nm natemollica-nm merged commit 2aac94b into release/1.2.x Feb 14, 2024
39 of 43 checks passed
@natemollica-nm natemollica-nm deleted the backport/natemollica-nm/datadog-integration/manual-cherry-pick-1-2-x branch February 14, 2024 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-backport signals that a PR will not contain a backport label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants