Add FortiGate hardware sensor table support by matthewleese · Pull Request #25010 · DataDog/integrations-core

matthewleese · 2026-08-26T18:08:39Z

What does this PR do?

Adds two new table-based metrics from FORTINET-FORTIGATE-MIB's fgHwSensorTable: fgHwSensorValue (numeric sensor reading) and fgHwSensorAlarmStatus (whether the sensor is out of normal range), tagged by sensor_index and sensor_name.

Motivation

FRNDM-506: expose FortiGate hardware sensor data (temperature, fan speed, voltage, etc., depending on device model) which is currently unmapped in the profile.

Caveat, please read before merging

fgHwSensorEntValue is a DisplayString, not a number. Its exact format (units, precision, e.g. "25.0 C" vs "3300" vs "12 V") isn't documented in the MIB and varies by sensor type and device model. This PR extracts the leading numeric portion via extract_value: '(\d+(?:\.\d+)?)', following the same pattern used elsewhere in this repo (e.g. ibm-lenovo-server.yaml).

I could not verify this regex against a live FortiGate device or a real customer snmpwalk, so it may not match every device's exact value string format. The e2e fixture uses representative but synthetic values ("25.0 C", "3300"). Recommend validating against a real device or customer-provided snmpwalk output before merging, or treating this as a starting point to refine.

Review checklist

Profile YAML change (fortinet-fortigate.yaml)
.snmprec fixture rows added (2 sensors, ordered numerically to fit the existing subtree)
e2e test updated to assert the new metrics/tags

Note: This PR was created by Claude

datadog-datadog-prod-us1-2 · 2026-08-26T18:11:22Z

🎉 All green!

🧪 All tests passed
❄️ No new flaky tests detected

🎯 Code Coverage (details)
• Patch Coverage: 100.00%
• Overall Coverage: 93.81% (+4.11%)

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 8e85f65 | Docs | View more details | Give us feedback!}

cit-pr-commenter-54b7da · 2026-08-26T18:11:53Z

evalya-impact-summary

Evalya CI impact

Impact analysis: 0 selected, 0 skipped (of 0 test tasks)
Publish tasks:   4 (always emitted)
Changed files:   6

Full impact report
Learn more about CI impact filtering

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dd31c7f2cc

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

dd-octo-sts · 2026-10-16T11:21:50Z

✅ Dispatcher tests: passed

Dispatcher beta: informational only
Existing CI remains the merge signal.

6/6 jobs

✅ 6 passed · nothing failed

Batches · ✅ batch-01 6/6

_{Dispatcher finished on 4d85af4 — GitHub Run · Dispatcher Logs.}

dd-octo-sts · 2026-10-16T11:34:29Z

Disk usage change

Commit 8e85f65 compared against 4729067.

Uncompressed

linux-aarch64	linux-x86_64	macos-aarch64	macos-x86_64	windows-x86_64
🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB

Details

Name	Version	Type	linux-aarch64	linux-x86_64	macos-aarch64	macos-x86_64	windows-x86_64
snmp	13.4.0	Integration	🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB	🔺 +1.35 KiB

Compressed

linux-aarch64	linux-x86_64	macos-aarch64	macos-x86_64	windows-x86_64
🔺 +290 B	🔺 +290 B	🔺 +290 B	🔺 +290 B	🔺 +290 B

Details

Name	Version	Type	linux-aarch64	linux-x86_64	macos-aarch64	macos-x86_64	windows-x86_64
snmp	13.4.0	Integration	🔺 +290 B	🔺 +290 B	🔺 +290 B	🔺 +290 B	🔺 +290 B

FRNDM-506: expose FORTINET-FORTIGATE-MIB's fgHwSensorTable (temperature, fan speed, voltage, etc., depending on device model), tagged by sensor_index and sensor_name, plus the per-sensor fgHwSensorAlarmStatus. fgHwSensorEntValue is a DisplayString whose exact format (units, precision) isn't documented and varies by sensor/device model, so fgHwSensorValue uses extract_value to pull the leading numeric portion out of it. This wasn't verified against a live device or a customer snmpwalk, so the regex may not match every device's exact value format; the e2e fixture uses representative but synthetic values ('25.0 C', '3300'). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

The unit test's assert_all_metrics_covered() and the metadata.csv description file both needed to know about fgHwSensorValue and fgHwSensorAlarmStatus, or CI fails with "metrics are collected but not asserted".

ruff format collapses a call onto one line when it fits within the line-length limit; the multi-line form was flagged by the CI lint gate.

validate-assets and validate-logs_validator failed with an internal Datadog system error unrelated to this PR's content ("not a problem with your assets" / "contact Datadog"). Isolated to this PR among recent open PRs, so retriggering rather than changing anything. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

fgHwSensorTable covers temperature and voltage sensors, which can report negative readings; the regex only matched from an unsigned digit, so a leading minus sign made extract_value fail and dropped the metric entirely.

matthewleese · 2026-10-28T16:26:50Z

@DataDog please fix my ci

datadog-official · 2026-10-28T16:26:55Z

I can only run on private repositories.

dd-octo-sts · 2026-10-28T16:30:33Z

Validation Report

All 22 validations passed.

Show details

Validation	Description	Status
`agent-reqs`	Verify check versions match the Agent requirements file	✅
`ci`	Validate CI configuration and code coverage settings	✅
`codeowners`	Validate every integration has a CODEOWNERS entry	✅
`config`	Validate default configuration files against spec.yaml	✅
`dep`	Verify dependency pins are consistent and Agent-compatible	✅
`http`	Validate integrations use the HTTP wrapper correctly	✅
`imports`	Validate check imports do not use deprecated modules	✅
`integration-style`	Validate check code style conventions	✅
`jmx-metrics`	Validate JMX metrics definition files and config	✅
`labeler`	Validate PR labeler config matches integration directories	✅
`legacy-signature`	Validate no integration uses the legacy Agent check signature	✅
`license-headers`	Validate Python files have proper license headers	✅
`licenses`	Validate third-party license attribution list	✅
`metadata`	Validate metadata.csv metric definitions	✅
`models`	Validate configuration data models match spec.yaml	✅
`openmetrics`	Validate OpenMetrics integrations disable the metric limit	✅
`package`	Validate Python package metadata, naming, and wheel contents	✅
`pr-description`	Validate the pull request checklist and visible description length	✅
`qa-label`	Validate the pull request declares whether it needs QA for the next Agent release	✅
`readmes`	Validate README files have required sections	✅
`saved-views`	Validate saved view JSON file structure and fields	✅
`version`	Validate version consistency between package and changelog	✅

View full run

matthewleese · 2026-10-30T11:35:09Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-10-30T11:35:15Z

View all feedbacks in Devflow UI.

2026-10-30 11:35:14 UTC ℹ️ Start processing command /merge

2026-10-30 11:35:17 UTC ❌ MergeQueue

The merge queue is disabled for this repository/branch.

temporal-github-worker-1 Bot added agent/review-requested ecosystems/review-requested product/review-requested labels Aug 26, 2026

dd-octo-sts Bot added the integration/snmp label Aug 26, 2026

matthewleese added the qa/required QA is required for this PR and will generate a QA card label Aug 26, 2026

matthewleese marked this pull request as ready for review August 28, 2026 17:44

matthewleese requested review from a team as code owners August 28, 2026 17:44

matthewleese requested review from NouhaManai96 and removed request for a team August 28, 2026 17:44

dd-octo-sts Bot added the team/agent-integrations label Aug 28, 2026

chatgpt-codex-connector Bot reviewed Aug 28, 2026

View reviewed changes

Comment thread snmp/datadog_checks/snmp/data/default_profiles/fortinet-fortigate.yaml Outdated

chouetz added the internal Identify a non-fork PR label Oct 2, 2026

matthewleese and others added 6 commits October 28, 2026 10:02

Fix CI: ruff format and add changelog fragment

7055819

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Assert and document the new fgHwSensor metrics

d0d1d18

The unit test's assert_all_metrics_covered() and the metadata.csv description file both needed to know about fgHwSensorValue and fgHwSensorAlarmStatus, or CI fails with "metrics are collected but not asserted".

Fix ruff formatting on fgHwSensorAlarmStatus assertion

60c0a04

ruff format collapses a call onto one line when it fits within the line-length limit; the multi-line form was flagged by the CI lint gate.

snmp: accept signed values in fgHwSensorValue extraction

dc4bc2c

fgHwSensorTable covers temperature and voltage sensors, which can report negative readings; the regex only matched from an unsigned digit, so a leading minus sign made extract_value fail and dropped the metric entirely.

matthewleese force-pushed the mleese/frndm-506-fortigate-hw-sensors branch from e90fd82 to dc4bc2c Compare October 28, 2026 14:04

matthewleese added the assets/no-deploy Prevents APW from deploying this PR in staging label Oct 28, 2026

Rerun CI

8e85f65

victorsprengel approved these changes Oct 30, 2026

View reviewed changes

Navigation Menu

Repository navigation

Add FortiGate hardware sensor table support - #25010

Add FortiGate hardware sensor table support#25010
matthewleese wants to merge 7 commits into
masterfrom
mleese/frndm-506-fortigate-hw-sensors

matthewleese commented Aug 26, 2026

Uh oh!

datadog-datadog-prod-us1-2 Bot commented Aug 26, 2026 •

edited by datadog-official Bot

Loading

Uh oh!

cit-pr-commenter-54b7da Bot commented Aug 26, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

dd-octo-sts Bot commented Oct 16, 2026 •

edited

Loading

Uh oh!

dd-octo-sts Bot commented Oct 16, 2026 •

edited

Loading

Uh oh!

matthewleese commented Oct 28, 2026

Uh oh!

datadog-official Bot commented Oct 28, 2026

Uh oh!

dd-octo-sts Bot commented Oct 28, 2026

Uh oh!

matthewleese commented Oct 30, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Oct 30, 2026 •

edited

Loading

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

matthewleese commented Aug 26, 2026

What does this PR do?

Motivation

Caveat, please read before merging

Review checklist

Uh oh!

datadog-datadog-prod-us1-2 Bot commented Aug 26, 2026 • edited by datadog-official Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cit-pr-commenter-54b7da Bot commented Aug 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

evalya-impact-summary

Evalya CI impact

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

dd-octo-sts Bot commented Oct 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Dispatcher tests: passed

Uh oh!

dd-octo-sts Bot commented Oct 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Disk usage change

Uncompressed

Compressed

Uh oh!

matthewleese commented Oct 28, 2026

Uh oh!

datadog-official Bot commented Oct 28, 2026

Uh oh!

dd-octo-sts Bot commented Oct 28, 2026

Validation Report

Uh oh!

matthewleese commented Oct 30, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Oct 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

datadog-datadog-prod-us1-2 Bot commented Aug 26, 2026 •

edited by datadog-official Bot

Loading

cit-pr-commenter-54b7da Bot commented Aug 26, 2026 •

edited

Loading

dd-octo-sts Bot commented Oct 16, 2026 •

edited

Loading

dd-octo-sts Bot commented Oct 16, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Oct 30, 2026 •

edited

Loading