Skip to content

Add grafana integration #2844

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.

Sign up for GitHub

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

Jump to bottom
Open
RTJL wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Add grafana integration #2844

RTJL wants to merge 18 commits into from
+4,101 −0

Conversation

@RTJL
Copy link

@RTJL RTJL commented Nov 4, 2025

What does this PR do?

Create a new integration for Grafana.

Motivation

What inspired you to submit this pull request?

I want to use Datadog to monitor the status of Grafana instances without exporting as custom metrics.

Review checklist

  • PR has a meaningful title or PR has the no-changelog label attached
  • Feature or bugfix has tests
  • Git history is clean
  • If PR impacts documentation, docs team has been notified or an issue has been opened on the documentation repo
  • If this PR includes a log pipeline, please add a description describing the remappers and processors.

Additional Notes

Anything else we should know when reviewing?

@RTJL RTJL requested review from a team as code owners November 4, 2025 00:47
@rtrieu rtrieu self-assigned this Nov 4, 2025
rtrieu
rtrieu requested changes Nov 4, 2025
View reviewed changes
Copy link
Contributor

@rtrieu rtrieu left a comment

Choose a reason for hiding this comment

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

Thanks for your PR! I've left you some feedback and suggestions mainly around consistency and clarity.

@RTJL RTJL requested a review from a team as a code owner November 5, 2025 03:25
RTJL and others added 17 commits November 8, 2025 15:21
@RTJL
add implementation and test for grafana integration
6c34ef8
@RTJL
remove testing code
6243232
@RTJL
fix fmting for the map of promp metrics
974c536
@RTJL @rtrieu
Apply suggestions from code review
ccca89d 
Co-authored-by: Rosa Trieu <[email protected]>
@RTJL @rtrieu
Apply metadata csv suggestions from code review
20b2821 
Co-authored-by: Rosa Trieu <[email protected]>
@RTJL
add integration site link for readme
8a8478b
@RTJL
fix linting for ci and codeowners
1223205
@RTJL
remove dashboard from manifest
c114e4a
@RTJL
fix lint for manifest
272ec57
@RTJL
delete template dashboard file
28d3ba9
@RTJL
bump the min version of datadog-checks-base pkg
b372a2c
@RTJL
add metric orientation to metadata csv
fc7a6ff
@RTJL
rename all grafana to Grafana
a84a309
@RTJL
add missing integration[metrics[check]] field for manifest
bdfff2b
@RTJL
add service check metadata
6f40452
@RTJL
add openmetrics health to metrics csv file
c0cc98d
@RTJL
update source_type_name for manifest file
b9d8d5d
@RTJL RTJL force-pushed the add-grafana-integration branch from 514e33b to b9d8d5d Compare November 8, 2025 07:23
@RTJL RTJL requested a review from rtrieu November 14, 2025 04:26
@RTJL
Copy link
Author

RTJL commented Nov 19, 2025

hi @rtrieu, could i trouble you to take a look at it again? thanks!

NouemanKHAL
NouemanKHAL requested changes Nov 28, 2025
View reviewed changes
Copy link
Member

@NouemanKHAL NouemanKHAL left a comment

Choose a reason for hiding this comment

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

Hi @RTJL ,
Thank you for your contribution! I reviewed your PR, overall everything LGTM!
I left few comments to address CI validation errors and some nits.

grafana/datadog_checks/grafana/config_models/instance.py
@@ -0,0 +1,168 @@
# This file is autogenerated.
Copy link
Member

@NouemanKHAL NouemanKHAL Nov 28, 2025

Choose a reason for hiding this comment

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

Could you run ddev validate models grafana -s to sync the files? The Validate repository / run / Validate job is addressing this.

grafana/tests/conftest.py

@pytest.fixture(scope='session')
def dd_environment():
compose_file = str(Path(__file__).parent.absolute() / 'docker' / 'docker-compose.yaml')
Copy link
Member

@NouemanKHAL NouemanKHAL Nov 28, 2025

Choose a reason for hiding this comment

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

Suggested change
compose_file = str(Path(__file__).parent.absolute() / 'docker' / 'docker-compose.yaml')
compose_file = str((Path(__file__).resolve().parent / "docker" / "docker-compose.yaml"))

nit:

grafana/hatch.toml
[env.collectors.datadog-checks]

[[envs.default.matrix]]
python = ["3.12"]
Copy link
Member

@NouemanKHAL NouemanKHAL Nov 28, 2025

Choose a reason for hiding this comment

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

Suggested change
python = ["3.12"]
python = ["3.13"]

fix: we have upgraded to python 3.13

grafana/README.md

## Troubleshooting

Need help? Contact [Datadog support][3].
Copy link
Member

@NouemanKHAL NouemanKHAL Nov 28, 2025

Choose a reason for hiding this comment

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

Suggested change
Need help? Contact [Datadog support][3].
Need help? Contact the [maintainer](https://github.com/DataDog/integrations-extras/blob/master/grafana/manifest.json) of this integration.

fix: troubleshooting contact should refer to the maintainer

@NouemanKHAL NouemanKHAL self-assigned this Nov 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NouemanKHAL NouemanKHAL NouemanKHAL requested changes

@rtrieu rtrieu rtrieu approved these changes

Requested changes must be addressed to merge this pull request.

Assignees

@NouemanKHAL NouemanKHAL

@rtrieu rtrieu

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@RTJL @NouemanKHAL @rtrieu