Skip to content

[cisco_meraki_metrics] Remove rsrp and rsrq metrics if no values present #16223

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+168 −2
Open

[cisco_meraki_metrics] Remove rsrp and rsrq metrics if no values present #16223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/cisco_meraki_metrics/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "0.4.3"
changes:
- description: Remove `rsrp` and `rsrq` if metrics are missing.
type: bugfix
link: https://github.com/elastic/integrations/pull/999
- version: "0.4.2"
changes:
- description: Fix API base URL config parameter
Expand Down
78 changes: 78 additions & 0 deletions ...aki_metrics/data_stream/device_health/_dev/test/pipeline/test-pipeline-device-health.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,84 @@
"service": {
"type": "meraki"
}
},
{
"@timestamp": "2024-09-30T21:12:16.000Z",
"agent": {
"ephemeral_id": "4a011336-4945-445b-b60d-4ffffa286835",
"id": "a386eb5b-0a51-499f-b8c1-1f37bd771852",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "8.15.2"
},
"data_stream": {
"dataset": "cisco_meraki_metrics.device_health",
"namespace": "default",
"type": "metrics"
},
"ecs": {
"version": "8.0.0"
},
"elastic_agent": {
"id": "a386eb5b-0a51-499f-b8c1-1f37bd771852",
"snapshot": true,
"version": "8.15.2"
},
"event": {
"agent_id_status": "verified",
"dataset": "cisco_meraki_metrics.device_health",
"duration": 8161138518,
"ingested": "2024-09-30T21:14:58Z",
"module": "meraki"
},
"host": {
"architecture": "x86_64",
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "c7f0ac74f5e24f78942164132c2c8ead",
"ip": "172.29.0.6",
"mac": "02-42-AC-1D-00-06",
"name": "docker-fleet-agent",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "6.8.0-45-generic",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"meraki": {
"device": {
"network_id": "L_113272913626746984",
"serial": "Q2BN-48JH-ZZRL",
"channel_utilization": {
"5": {
"utilization_80211": 3.81,
"utilization_non_80211": 0.03,
"utilization_total": 3.84
},
"2_4": {
"utilization_80211": 8.46,
"utilization_non_80211": 0.65,
"utilization_total": 9.11
}
}
},
"organization_id": "136261",
"uplink": {
"rsrp": "-",
"rsrq": "-"
}
},
"metricset": {
"name": "device_health",
"period": 60000
},
"service": {
"type": "meraki"
}
}
]
}
77 changes: 76 additions & 1 deletion ...ta_stream/device_health/_dev/test/pipeline/test-pipeline-device-health.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"wifi1": {
"utilization_80211": 0.0381,
"utilization_non_80211": 0.0003,
"utilization_non_80211": 3.0E-4,
"utilization_total": 0.0384
}
},
Expand Down Expand Up @@ -85,6 +85,81 @@
"service": {
"type": "meraki"
}
},
{
"@timestamp": "2024-09-30T21:12:16.000Z",
"agent": {
"ephemeral_id": "4a011336-4945-445b-b60d-4ffffa286835",
"id": "a386eb5b-0a51-499f-b8c1-1f37bd771852",
"name": "docker-fleet-agent",
"type": "metricbeat",
"version": "8.15.2"
},
"data_stream": {
"dataset": "cisco_meraki_metrics.device_health",
"namespace": "default",
"type": "metrics"
},
"ecs": {
"version": "8.0.0"
},
"elastic_agent": {
"id": "a386eb5b-0a51-499f-b8c1-1f37bd771852",
"snapshot": true,
"version": "8.15.2"
},
"event": {
"agent_id_status": "verified",
"dataset": "cisco_meraki_metrics.device_health",
"duration": 8161138518,
"ingested": "2024-09-30T21:14:58Z",
"module": "meraki"
},
"host": {
"architecture": "x86_64",
"containerized": false,
"hostname": "docker-fleet-agent",
"id": "c7f0ac74f5e24f78942164132c2c8ead",
"ip": "172.29.0.6",
"mac": "02-42-AC-1D-00-06",
"name": "docker-fleet-agent",
"os": {
"codename": "focal",
"family": "debian",
"kernel": "6.8.0-45-generic",
"name": "Ubuntu",
"platform": "ubuntu",
"type": "linux",
"version": "20.04.6 LTS (Focal Fossa)"
}
},
"meraki": {
"device": {
"channel_utilization": {
"wifi0": {
"utilization_80211": 0.0846,
"utilization_non_80211": 0.0065,
"utilization_total": 0.0911
},
"wifi1": {
"utilization_80211": 0.0381,
"utilization_non_80211": 3.0E-4,
"utilization_total": 0.0384
}
},
"network_id": "L_113272913626746984",
"serial": "Q2BN-48JH-ZZRL"
},
"organization_id": "136261",
"uplink": {}
},
"metricset": {
"name": "device_health",
"period": 60000
},
"service": {
"type": "meraki"
}
}
]
}
8 changes: 8 additions & 0 deletions .../cisco_meraki_metrics/data_stream/device_health/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,18 @@ processors:
field: meraki.uplink.rsrp
type: float
ignore_missing: true
on_failure:
- remove:
field: meraki.uplink.rsrp
ignore_failure: true
- convert:
field: meraki.uplink.rsrq
type: float
ignore_missing: true
on_failure:
- remove:
field: meraki.uplink.rsrq
ignore_failure: true
- rename:
field: meraki.device.channel_utilization.2_4
target_field: meraki.device.channel_utilization.wifi0
Expand Down
2 changes: 1 addition & 1 deletion packages/cisco_meraki_metrics/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 3.2.0
name: cisco_meraki_metrics
title: Cisco Meraki Metrics
version: 0.4.2
version: 0.4.3
description: Collect metrics from Cisco Meraki with Elastic Agent.
type: integration
categories:
Expand Down