From b14d4acef856fc3cc105e039178ea9d73ec4927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Mon, 5 Oct 2020 01:32:45 +0200 Subject: [PATCH] Add hosts_* filter, change service_* filter --- example.sh | 2 +- lql/v1table.go | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/example.sh b/example.sh index 0b44457..203f87f 100755 --- a/example.sh +++ b/example.sh @@ -35,7 +35,7 @@ $CURL "$SERVER/v1/table/hosts?columns=name&column=address&column=groups&limit=3" $CURL "$SERVER/v1/stats/tactical_overview" # Services -$CURL "$SERVER/v1/table/services?limit=1&filter=service_unhandled" +$CURL "$SERVER/v1/table/services?limit=1&filter=services_unhandled" # Services by hostname $CURL "$SERVER/v1/table/services?filter=Filter%3A%20host_name%20%3D%20checkmk01.%2A" \ No newline at end of file diff --git a/lql/v1table.go b/lql/v1table.go index deae163..b727cef 100644 --- a/lql/v1table.go +++ b/lql/v1table.go @@ -13,6 +13,7 @@ var v1TableFilters = map[string][]string{} func init() { v1TableColumns = make(map[string][]string, 2) // Increment this when you add tables v1TableColumns["hosts"] = []string{ + "state", "name", "display_name", "address", @@ -31,25 +32,39 @@ func init() { "plugin_output", } - v1TableFilters = make(map[string][]string, 3) - v1TableFilters["service_problems"] = []string{ + v1TableFilters = make(map[string][]string, 6) + v1TableFilters["services_problems"] = []string{ "Filter: state > 0", "Filter: scheduled_downtime_depth = 0", "Filter: host_scheduled_downtime_depth = 0", "Filter: host_state = 0", } - v1TableFilters["service_unhandled"] = []string{ + v1TableFilters["services_unhandled"] = []string{ "Filter: state > 0", "Filter: scheduled_downtime_depth = 0", "Filter: host_scheduled_downtime_depth = 0", "Filter: acknowledged = 0", "Filter: host_state = 0", } - v1TableFilters["service_stale"] = []string{ + v1TableFilters["services_stale"] = []string{ "Filter: service_staleness >= 1.5", "Filter: host_scheduled_downtime_depth = 0", "Filter: service_scheduled_downtime_depth = 0", } + v1TableFilters["hosts_problems"] = []string{ + "Filter: state >= 0", + "Filter: state > 0", + "Filter: scheduled_downtime_depth = 0", + } + v1TableFilters["hosts_unhandled"] = []string{ + "Filter: state > 0", + "Filter: scheduled_downtime_depth = 0", + "Filter: acknowledged = 0", + } + v1TableFilters["hosts_stale"] = []string{ + "Filter: host_staleness >= 1.5", + "Filter: host_scheduled_downtime_depth = 0", + } } type v1TableGetParams struct {