Skip to content

Commit 1b011cf

Browse files
Use a forced metric type of gauge for ccmRejectedPhones and ccmUnregisteredPhones. (#17722) (#17751)
* Use a forced metric type of gauge for ccmRejectedPhones and ccmUnregisteredPhones. * Fix test_cisco_voice profile test. * Add changelog. (cherry picked from commit ff2f2d0) Co-authored-by: Jim Wilson <86026167+jmw51798@users.noreply.github.com>
1 parent 6509a6e commit 1b011cf

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

snmp/changelog.d/17722.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Use a forced metric type of gauge for ccmRejectedPhones and ccmUnregisteredPhones so they are not incorrectly inferred to be rate types.

snmp/datadog_checks/snmp/data/default_profiles/_cisco-voice.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ metrics:
7474
name: ccmRegisteredPhones
7575
OID: 1.3.6.1.4.1.9.9.156.1.5.5.0
7676
- MIB: CISCO-CCM-MIB
77+
metric_type: gauge
7778
symbol:
7879
name: ccmRejectedPhones
7980
OID: 1.3.6.1.4.1.9.9.156.1.5.7.0
8081
- MIB: CISCO-CCM-MIB
82+
metric_type: gauge
8183
symbol:
8284
name: ccmUnregisteredPhones
8385
OID: 1.3.6.1.4.1.9.9.156.1.5.6.0

snmp/tests/test_profiles.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,7 @@ def test_cisco_voice(aggregator):
182182
for cvp in cvp_gauges:
183183
aggregator.assert_metric('snmp.{}'.format(cvp), metric_type=aggregator.GAUGE, tags=tags)
184184

185-
ccms_counts = ["ccmRejectedPhones", "ccmUnregisteredPhones"]
186-
187-
ccms_gauges = ["ccmRegisteredGateways", "ccmRegisteredPhones"]
188-
189-
for ccm in ccms_counts:
190-
aggregator.assert_metric('snmp.{}'.format(ccm), metric_type=aggregator.RATE, tags=tags)
185+
ccms_gauges = ["ccmRegisteredGateways", "ccmRegisteredPhones", "ccmRejectedPhones", "ccmUnregisteredPhones"]
191186

192187
for ccm in ccms_gauges:
193188
aggregator.assert_metric('snmp.{}'.format(ccm), metric_type=aggregator.GAUGE, tags=tags)

0 commit comments

Comments
 (0)