add some daemon infos

Author: tbauriedel

modules/base/collector.go

@@ -55,7 +55,7 @@ func Collect(c *collection.Collection) {
 	}
 
 	// Add repository settings, at least one of the locations should be found
-	c.AddFilesAtLeastOne(ModuleName, repositoryFiles...)
+	c.AddFilesIfFound(ModuleName, repositoryFiles...)
 
 	for _, cmd := range commands {
 		name := ModuleName + "/" + cmd[0] + ".txt"

modules/icinga2/collector.go

@@ -70,7 +70,7 @@ func Collect(c *collection.Collection) {
 		c.AddFiles(ModuleName, file)
 	}
 
-	c.AddFilesAtLeastOne(ModuleName, pluginFiles...)
+	c.AddFilesIfFound(ModuleName, pluginFiles...)
 
 	for _, file := range optionalFiles {
 		if _, err := os.Stat(file); err != nil {

modules/icingadirector/collector.go

@@ -11,7 +11,18 @@ const (
 )
 
 var commands = map[string][]string{
-	"health.txt": {"icingacli", "director", "health"},
+	"health.txt":              {"icingacli", "director", "health"},
+	"user-icingadirector.txt": {"id", "icingadirector"},
+}
+
+var possibleDaemons = []string{
+	"/usr/lib/systemd/system/icinga-director.service",
+	"/etc/systemd/system/icinga-director.service",
+	"/etc/systemd/system/icinga-director.service.d",
+}
+
+var journalctlLogs = map[string]collection.JournalElement{
+	"journalctl-director.txt": {Service: "icinga-director.service"},
 }
 
 // Detect if Icinga Director is installed on the system.
@@ -38,6 +49,16 @@ func Collect(c *collection.Collection) {
 		c.AddCommandOutput(ModuleName+"/"+name, cmd[0], cmd[1:]...)
 	}
 
+	for _, file := range possibleDaemons {
+		c.AddFilesIfFound(ModuleName, file)
+	}
+
+	for name, element := range journalctlLogs {
+		if service, err := collection.FindServices(element.Service); err == nil && len(service) > 0 {
+			c.AddCommandOutput(ModuleName+"/"+name, "journalctl", "-u", element.Service)
+		}
+	}
+
 	// Get GIT Repository details
 	if path, ok := collection.IsGitRepository(InstallationPath); collection.DetectGitInstalled() && ok {
 		c.AddGitRepoInfo(ModuleName+"/git-info.yml", path)

modules/icingaweb2/collector.go

@@ -24,9 +24,34 @@ var files = []string{
 	"/var/log/icingaweb2",
 }
 
+var possibleDaemons = []string{
+	"/usr/lib/systemd/system/icinga-vspheredb.service",
+	"/etc/systemd/system/icinga-vspheredb.service",
+	"/etc/systemd/system/icinga-vspheredb.service.d/",
+	"/usr/lib/systemd/system/icinga-reporting.service",
+	"/etc/systemd/system/icinga-reporting.service",
+	"/etc/systemd/system/icinga-reporting.service.d",
+	"/usr/lib/systemd/system/icinga-x509.service",
+	"/etc/systemd/system/icinga-x509.service",
+	"/etc/systemd/system/icinga-x509.service.d",
+}
+
+var tmpFiles = []string{
+	"/usr/lib/tmpfiles.d/icinga-vspheredb.conf",
+	"/etc/tmpfiles.d/icinga-vspheredb.conf",
+}
+
 var commands = map[string][]string{
-	"version.txt": {"icingacli", "version"},
-	"modules.txt": {"icingacli", "module", "list"},
+	"version.txt":              {"icingacli", "version"},
+	"modules.txt":              {"icingacli", "module", "list"},
+	"vpsheredb-socket.txt":     {"ls", "-la", "/run/icinga-vspheredb/"},
+	"user-icingavspheredb.txt": {"id", "icingavspheredb"},
+}
+
+var journalctlLogs = map[string]collection.JournalElement{
+	"journalctl-vspheredb.txt": {Service: "icinga-vspheredb.service"},
+	"journalctl-reporting.txt": {Service: "icinga-reporting.service"},
+	"journalctl-x509.txt":      {Service: "icinga-x509.service"},
 }
 
 var obfuscators = []*obfuscate.Obfuscator{
@@ -72,6 +97,14 @@ func Collect(c *collection.Collection) {
 		c.AddCommandOutput(ModuleName+"/"+name, cmd[0], cmd[1:]...)
 	}
 
+	for _, file := range possibleDaemons {
+		c.AddFilesIfFound(ModuleName, file)
+	}
+
+	for _, file := range tmpFiles {
+		c.AddFilesIfFound(ModuleName, file)
+	}
+
 	// Detect PHP related packages and services
 	c.AddInstalledPackagesRaw(ModuleName+"/packages-php.txt", "*php*")
 
@@ -81,6 +114,12 @@ func Collect(c *collection.Collection) {
 		}
 	}
 
+	for name, element := range journalctlLogs {
+		if service, err := collection.FindServices(element.Service); err == nil && len(service) > 0 {
+			c.AddCommandOutput(ModuleName+"/"+name, "journalctl", "-u", element.Service)
+		}
+	}
+
 	// Detect webserver packages
 	c.AddInstalledPackagesRaw(ModuleName+"/packages-webserver.txt", "*apache*", "*httpd*")
 }

modules/mysql/collector.go

@@ -46,5 +46,5 @@ func Collect(c *collection.Collection) {
 
 	c.AddInstalledPackagesRaw(ModuleName+"/packages.txt", "*mysql*", "*mariadb*")
 	c.AddServiceStatusRaw(ModuleName+"/service.txt", service)
-	c.AddFilesAtLeastOne(ModuleName, possibleConfigPaths...)
+	c.AddFilesIfFound(ModuleName, possibleConfigPaths...)
 }

modules/postgresql/collector.go

@@ -41,7 +41,7 @@ func Collect(c *collection.Collection) {
 	c.Log.Info("Collecting PostgreSQL information")
 
 	c.AddInstalledPackagesRaw(ModuleName+"/packages.txt", "*postgresql*", "*pgsql*")
-	c.AddFilesAtLeastOne(ModuleName, files...)
+	c.AddFilesIfFound(ModuleName, files...)
 
 	for _, service := range possibleServices {
 		c.AddServiceStatusRaw(ModuleName+"/service-"+service+".txt", service)

pkg/collection/collection.go

@@ -148,7 +148,7 @@ func (c *Collection) AddFiles(prefix, source string) {
 	}
 }
 
-func (c *Collection) AddFilesAtLeastOne(prefix string, sources ...string) {
+func (c *Collection) AddFilesIfFound(prefix string, sources ...string) {
 	var foundFiles int
 
 	for _, source := range sources {
@@ -167,7 +167,7 @@ func (c *Collection) AddFilesAtLeastOne(prefix string, sources ...string) {
 	}
 
 	if foundFiles == 0 {
-		c.Log.Warnf("Found no files under: %s", strings.Join(sources, " "))
+		c.Log.Debugf("Found no files under: %s", strings.Join(sources, " "))
 	}
 }
 

pkg/collection/services.go

@@ -15,6 +15,10 @@ const (
 
 const sysVInitD = "/etc/init.d"
 
+type JournalElement struct {
+	Service string
+}
+
 // ErrNoServiceManager is returned when we could not detect one.
 var ErrNoServiceManager = errors.New("could not detect a supported service manager")