From a85c902fe96bc7d538a08d64977dc2b146484db7 Mon Sep 17 00:00:00 2001 From: Kevin Wallace Date: Sun, 29 May 2022 18:48:17 -0700 Subject: [PATCH] Include device_graphs in saved os module test data --- tests/data/openbsd_pf.json | 51 +++++++++++++++++++++++++++++++++++++- tests/module_tables.yaml | 3 +++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/tests/data/openbsd_pf.json b/tests/data/openbsd_pf.json index 80f9be8ca2..d9efe91c8d 100644 --- a/tests/data/openbsd_pf.json +++ b/tests/data/openbsd_pf.json @@ -18,6 +18,55 @@ } ] }, - "poller": "matches discovery" + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.30155.23.1", + "sysDescr": "OpenBSD hostname.example.com 7.1 GENERIC.MP#465 amd64", + "sysContact": "", + "version": "7.1", + "hardware": null, + "features": null, + "os": "openbsd", + "type": "server", + "serial": null, + "icon": "openbsd.svg", + "location": "" + } + ], + "device_graphs": [ + { + "graph": "availability" + }, + { + "graph": "pf_drops" + }, + { + "graph": "pf_inserts" + }, + { + "graph": "pf_matches" + }, + { + "graph": "pf_removals" + }, + { + "graph": "pf_searches" + }, + { + "graph": "pf_states" + }, + { + "graph": "ping_perf" + }, + { + "graph": "poller_modules_perf" + }, + { + "graph": "poller_perf" + } + ] + } } } diff --git a/tests/module_tables.yaml b/tests/module_tables.yaml index a095118d50..69c1813e4d 100644 --- a/tests/module_tables.yaml +++ b/tests/module_tables.yaml @@ -103,6 +103,9 @@ os: included_fields: [sysName, sysObjectID, sysDescr, sysContact, version, hardware, features, location, os, type, serial, icon] joins: - { left: devices.location_id, right: locations.id, select: [location] } + device_graphs: + included_fields: [graph] + order_by: graph processors: processors: excluded_fields: [device_id, processor_id]