From 5c89fe0294437736628773dbb98cbc5db8d5a54d Mon Sep 17 00:00:00 2001 From: tbauriedel Date: Mon, 23 May 2022 13:13:58 +0200 Subject: [PATCH 1/2] extension for module icinga2 --- modules/icinga2/collector.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/icinga2/collector.go b/modules/icinga2/collector.go index d4f7f5a..8194c3a 100644 --- a/modules/icinga2/collector.go +++ b/modules/icinga2/collector.go @@ -31,6 +31,13 @@ var commands = map[string][]string{ "objects-zones.txt": {"icinga2", "object", "list", "--type", "Zone"}, "objects-endpoints.txt": {"icinga2", "object", "list", "--type", "Endpoint"}, "variables.txt": {"icinga2", "variable", "list"}, + "user-icinga.txt": {"id", "icinga"}, +} + +var possibleDaemons = []string{ + "/usr/lib/systemd/system/icinga2.service", + "/etc/systemd/system/icinga2.service", + "/etc/systemd/system/icinga2.service.d", } var obfuscators = []*obfuscate.Obfuscator{ @@ -83,4 +90,8 @@ func Collect(c *collection.Collection) { for name, cmd := range commands { c.AddCommandOutput(ModuleName+"/"+name, cmd[0], cmd[1:]...) } + + for _, file := range possibleDaemons { + c.AddFilesIfFound(ModuleName, file) + } } From 61e0a7b4f67d43ae40a0be3f087e821510693e4d Mon Sep 17 00:00:00 2001 From: tbauriedel Date: Mon, 23 May 2022 13:13:58 +0200 Subject: [PATCH 2/2] extension for module icinga2 --- modules/icinga2/collector.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/icinga2/collector.go b/modules/icinga2/collector.go index 8194c3a..6563362 100644 --- a/modules/icinga2/collector.go +++ b/modules/icinga2/collector.go @@ -32,6 +32,7 @@ var commands = map[string][]string{ "objects-endpoints.txt": {"icinga2", "object", "list", "--type", "Endpoint"}, "variables.txt": {"icinga2", "variable", "list"}, "user-icinga.txt": {"id", "icinga"}, + "user-nagios.txt": {"id", "nagios"}, } var possibleDaemons = []string{