kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-10-21 11:29:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

2462 debugging logs (#830)

Browse Source 
* [refactoring] simplify method and make it more efficient

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* [WIP] Introduce `logs` command to collects logs from various places

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Handle globs properly and merge default logs with user provided ones

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Change default logs location to be the current directory

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Skip new field in the schema tests

TODO: Update the schema and re-enable

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Remove test focus

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Add more default services

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Don't try to run journactl on non systemd distros

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Add more files (for openrc)

c6fdf6ee67/pkg/bundled/cloudconfigs/09_openrc_services.yaml (L52)

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Use standard library for globbing

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

* Capture all files under `/var/log`

because there is also k3s.log (maybe also k0s) etc. Better have them all
than missing some.

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

---------

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
Dimitris Karakasilis
2025-07-01 10:48:11 +03:00
committed by GitHub
parent 41b52e9970
commit d85d7985fe
5 changed files with 898 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/config/config.go
View File

@@ -33,6 +33,12 @@ const (
FilePrefix = "file://"
)
// LogsConfig represents the configuration for log collection
type LogsConfig struct {
Journal []string `yaml:"journal,omitempty"`
Files []string `yaml:"files,omitempty"`
}
type Install struct {
Auto bool `yaml:"auto,omitempty"`
Reboot bool `yaml:"reboot,omitempty"`
@@ -157,6 +163,7 @@ type Config struct {
UkiMaxEntries int `yaml:"uki-max-entries,omitempty" mapstructure:"uki-max-entries"`
BindPCRs []string `yaml:"bind-pcrs,omitempty" mapstructure:"bind-pcrs"`
BindPublicPCRs []string `yaml:"bind-public-pcrs,omitempty" mapstructure:"bind-public-pcrs"`
Logs *LogsConfig `yaml:"logs,omitempty"`
}
// WriteInstallState writes the state.yaml file to the given state and recovery paths

7
pkg/config/config_test.go
View File

@@ -17,11 +17,12 @@ package config_test
import (
"fmt"
sdkTypes "github.com/kairos-io/kairos-sdk/types"
"path/filepath"
"reflect"
"strings"
sdkTypes "github.com/kairos-io/kairos-sdk/types"
pkgConfig "github.com/kairos-io/kairos-agent/v2/pkg/config"
"github.com/kairos-io/kairos-agent/v2/pkg/constants"
v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
@@ -93,8 +94,8 @@ func structFieldsContainedInOtherStruct(left, right interface{}) {
leftTagName := getTagName(leftTypes.Field(i).Tag.Get("yaml"))
leftFieldName := leftTypes.Field(i).Name
if leftTypes.Field(i).IsExported() {
It(fmt.Sprintf("Checks that the new schema contians the field %s", leftFieldName), func() {
if leftFieldName == "Source" || leftFieldName == "NoUsers" || leftFieldName == "BindPublicPCRs" || leftFieldName == "BindPCRs" {
It(fmt.Sprintf("Checks that the new schema contains the field %s", leftFieldName), func() {
if leftFieldName == "Source" || leftFieldName == "NoUsers" || leftFieldName == "BindPublicPCRs" || leftFieldName == "BindPCRs" || leftFieldName == "Logs" {
Skip("Schema not updated yet")
}
Expect(