diff --git a/modules/icinga2/collector.go b/modules/icinga2/collector.go index 6563362..852e9cd 100644 --- a/modules/icinga2/collector.go +++ b/modules/icinga2/collector.go @@ -23,6 +23,7 @@ var optionalFiles = []string{ "/var/log/icinga2/error.log", "/var/log/icinga2/crash", "/var/log/icinga2/debug.log", + "/etc/logrotate.d/icinga2", } var commands = map[string][]string{ diff --git a/modules/icingadb/collector.go b/modules/icingadb/collector.go index 8b93f95..f24f2e0 100644 --- a/modules/icingadb/collector.go +++ b/modules/icingadb/collector.go @@ -20,6 +20,10 @@ var files = []string{ "/etc/icinga2/features-enabled/icingadb.conf", } +var optionalFiles = []string{ + "/etc/logrotate.d/icingadb-redis-server", +} + var services = []string{ "icingadb", "icingadb-redis", @@ -67,6 +71,14 @@ func Collect(c *collection.Collection) { c.AddFiles(ModuleName, file) } + for _, file := range optionalFiles { + if _, err := os.Stat(file); err != nil { + continue + } + + c.AddFiles(ModuleName, file) + } + for _, service := range services { c.AddServiceStatusRaw(ModuleName+"/service-"+service+".txt", service) } diff --git a/modules/mysql/collector.go b/modules/mysql/collector.go index 09bc9e1..619ea94 100644 --- a/modules/mysql/collector.go +++ b/modules/mysql/collector.go @@ -2,6 +2,7 @@ package mysql import ( "github.com/NETWAYS/support-collector/pkg/collection" + "os" ) const ( @@ -26,6 +27,11 @@ var commands = map[string][]string{ "mysql-version.txt": {"mysql", "-V"}, } +var optionalFiles = []string{ + "/etc/logrotate.d/mariadb", + "/etc/logrotate.d/mysql", +} + // Detect if a MySQL or MariaDB daemon appears to be running. func Detect() string { for _, name := range possibleServices { @@ -55,4 +61,12 @@ func Collect(c *collection.Collection) { for name, cmd := range commands { c.AddCommandOutput(ModuleName+"/"+name, cmd[0], cmd[1:]...) } + + for _, file := range optionalFiles { + if _, err := os.Stat(file); err != nil { + continue + } + + c.AddFiles(ModuleName, file) + } }