Skip to content

Add Configuration for SCALIBR #1034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bromivipo wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Configuration for SCALIBR #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3578577
Add Configuration for SCALIBR
bromivipo Aug 4, 2026
7871aba
Merge branch 'master' into extended_config
petercieslak Aug 12, 2026
49e0455
remove inteval
bromivipo Aug 12, 2026
03424d6
Merge branch 'master' into extended_config
bromivipo Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 91 additions & 44 deletions agentconfig/agentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ const (

prodEndpoint = "{zone}-osconfig.googleapis.com.:443"

osInventoryEnabledDefault = false
guestPoliciesEnabledDefault = false
taskNotificationEnabledDefault = false
debugEnabledDefault = false
osInventoryEnabledDefault = false
guestPoliciesEnabledDefault = false
taskNotificationEnabledDefault = false
debugEnabledDefault = false
extendedInventoryEnabledDefault = false

oldConfigDirLinux = "/etc/osconfig"
cacheDirLinux = "/var/lib/google_osconfig_agent"
Expand Down Expand Up @@ -122,25 +123,27 @@ var (
)

type config struct {
aptRepoFilePath string
instanceName string
instanceZone string
projectID string
svcEndpoint string
googetRepoFilePath string
zypperRepoFilePath string
yumRepoFilePath string
instanceID string
universeDomain string
numericProjectID int64
osConfigPollInterval int
debugEnabled bool
taskNotificationEnabled bool
guestPoliciesEnabled bool
osInventoryEnabled bool
scalibrLinuxEnabled bool
guestAttributesEnabled bool
traceGetInventory bool
aptRepoFilePath string
instanceName string
instanceZone string
projectID string
svcEndpoint string
googetRepoFilePath string
zypperRepoFilePath string
yumRepoFilePath string
instanceID string
universeDomain string
numericProjectID int64
osConfigPollInterval int
debugEnabled bool
taskNotificationEnabled bool
guestPoliciesEnabled bool
osInventoryEnabled bool
scalibrLinuxEnabled bool
guestAttributesEnabled bool
traceGetInventory bool
extendedInventoryEnabled bool
extendedInventoryExtractorsAllowed []string
}

func (c *config) parseFeatures(features string, enabled bool) {
Expand Down Expand Up @@ -196,6 +199,17 @@ func parseBool(s string) bool {
return enabled
}

func parseSlice(s string) []string {
var slice []string
for _, item := range strings.Split(s, ",") {
item = strings.TrimSpace(item)
if item != "" {
slice = append(slice, item)
}
}
return slice
}

type metadataJSON struct {
Instance instanceJSON
Project projectJSON
Expand All @@ -220,32 +234,35 @@ type universeJSON struct {
}

type attributesJSON struct {
PollIntervalOld *json.Number `json:"os-config-poll-interval"`
PollInterval *json.Number `json:"osconfig-poll-interval"`
InventoryEnabledOld string `json:"os-inventory-enabled"`
InventoryEnabled string `json:"enable-os-inventory"`
PreReleaseFeaturesOld string `json:"os-config-enabled-prerelease-features"`
PreReleaseFeatures string `json:"osconfig-enabled-prerelease-features"`
DebugEnabledOld string `json:"enable-os-config-debug"`
LogLevel string `json:"osconfig-log-level"`
OSConfigEndpointOld string `json:"os-config-endpoint"`
OSConfigEndpoint string `json:"osconfig-endpoint"`
OSConfigEnabled string `json:"enable-osconfig"`
DisabledFeatures string `json:"osconfig-disabled-features"`
EnableGuestAttributes string `json:"enable-guest-attributes"`
TraceGetInventory string `json:"trace-get-inventory"`
ScalibrLinuxEnabled string `json:"enable-scalibr-linux"`
PollIntervalOld *json.Number `json:"os-config-poll-interval"`
PollInterval *json.Number `json:"osconfig-poll-interval"`
InventoryEnabledOld string `json:"os-inventory-enabled"`
InventoryEnabled string `json:"enable-os-inventory"`
PreReleaseFeaturesOld string `json:"os-config-enabled-prerelease-features"`
PreReleaseFeatures string `json:"osconfig-enabled-prerelease-features"`
DebugEnabledOld string `json:"enable-os-config-debug"`
LogLevel string `json:"osconfig-log-level"`
OSConfigEndpointOld string `json:"os-config-endpoint"`
OSConfigEndpoint string `json:"osconfig-endpoint"`
OSConfigEnabled string `json:"enable-osconfig"`
DisabledFeatures string `json:"osconfig-disabled-features"`
EnableGuestAttributes string `json:"enable-guest-attributes"`
TraceGetInventory string `json:"trace-get-inventory"`
ScalibrLinuxEnabled string `json:"enable-scalibr-linux"`
ExtendedInventoryEnabled string `json:"osconfig-extended-inventory-enabled"`
ExtendedInventoryExtractorsAllowed string `json:"osconfig-extended-inventory-extractors-allowed"`
}

func createConfigFromMetadata(md metadataJSON) *config {
old := getAgentConfig()
c := &config{
osInventoryEnabled: osInventoryEnabledDefault,
guestPoliciesEnabled: guestPoliciesEnabledDefault,
taskNotificationEnabled: taskNotificationEnabledDefault,
debugEnabled: debugEnabledDefault,
svcEndpoint: prodEndpoint,
osConfigPollInterval: osConfigPollIntervalDefault,
osInventoryEnabled: osInventoryEnabledDefault,
guestPoliciesEnabled: guestPoliciesEnabledDefault,
taskNotificationEnabled: taskNotificationEnabledDefault,
debugEnabled: debugEnabledDefault,
svcEndpoint: prodEndpoint,
osConfigPollInterval: osConfigPollIntervalDefault,
extendedInventoryEnabled: extendedInventoryEnabledDefault,

googetRepoFilePath: googetRepoFilePath,
zypperRepoFilePath: zypperRepoFilePath,
Expand Down Expand Up @@ -374,10 +391,30 @@ func createConfigFromMetadata(md metadataJSON) *config {
setScalibrEnablement(md, c)
setSVCEndpoint(md, c)
setTraceGetInventory(md, c)
setExtendedInventory(md, c)

return c
}

func setExtendedInventory(md metadataJSON, c *config) {
projectSettings := md.Project.Attributes
instanceSettings := md.Instance.Attributes

if projectSettings.ExtendedInventoryEnabled != "" {
c.extendedInventoryEnabled = parseBool(projectSettings.ExtendedInventoryEnabled)
}
if instanceSettings.ExtendedInventoryEnabled != "" {
c.extendedInventoryEnabled = parseBool(instanceSettings.ExtendedInventoryEnabled)
}

if projectSettings.ExtendedInventoryExtractorsAllowed != "" {
c.extendedInventoryExtractorsAllowed = parseSlice(projectSettings.ExtendedInventoryExtractorsAllowed)
}
if instanceSettings.ExtendedInventoryExtractorsAllowed != "" {
c.extendedInventoryExtractorsAllowed = parseSlice(instanceSettings.ExtendedInventoryExtractorsAllowed)
}
}

func setScalibrEnablement(md metadataJSON, c *config) {
projectSetting := md.Project.Attributes.ScalibrLinuxEnabled
instanceSetting := md.Instance.Attributes.ScalibrLinuxEnabled
Expand Down Expand Up @@ -601,6 +638,16 @@ func TraceGetInventory() bool {
return getAgentConfig().traceGetInventory
}

// ExtendedInventoryEnabled indicates whether extended inventory collection should be enabled.
func ExtendedInventoryEnabled() bool {
return getAgentConfig().extendedInventoryEnabled
}

// ExtendedInventoryExtractorsAllowed returns the allowed extractors for extended inventory.
func ExtendedInventoryExtractorsAllowed() []string {
return getAgentConfig().extendedInventoryExtractorsAllowed
}

// ZypperRepoDir is the location of the zypper repo files.
func ZypperRepoDir() string {
return zypperRepoDir
Expand Down
Loading
Loading