diff options
| author | Shulhan <ms@kilabit.info> | 2022-04-10 20:03:57 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2022-04-10 20:04:42 +0700 |
| commit | 780e7477cce6cfe4ed84b69dfffee830ed0dfd0b (patch) | |
| tree | 14745822f5d9516946e1f1d547ea6ff1c8b32349 /0001-apps-hostmetrics.patch | |
| parent | a57f3fc30dc1f8c933f39d2c37792fa03d8c3ab9 (diff) | |
| download | google-cloud-ops-agent-git-780e7477cce6cfe4ed84b69dfffee830ed0dfd0b.tar.xz | |
all: update to release 2.13.0
This release update the patch format using "git diff".
Diffstat (limited to '0001-apps-hostmetrics.patch')
| -rw-r--r-- | 0001-apps-hostmetrics.patch | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/0001-apps-hostmetrics.patch b/0001-apps-hostmetrics.patch index 8a5a8a8..1414457 100644 --- a/0001-apps-hostmetrics.patch +++ b/0001-apps-hostmetrics.patch @@ -1,22 +1,9 @@ -diff --git a/apps/hostmetrics.go b/apps/hostmetrics.go -index 84bdc49..14a77f7 100644 ---- a/apps/hostmetrics.go -+++ b/apps/hostmetrics.go -@@ -43,8 +43,6 @@ func (r MetricsReceiverHostmetrics) Pipelines() []otel.Pipeline { - "filesystem": struct{}{}, - "network": struct{}{}, - "paging": struct{}{}, -- "process": struct{}{}, -- "processes": struct{}{}, - }, - }, - }, diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go -index 1916bcd..a8443ec 100644 +index 280bce24..f8cf09ee 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go -@@ -47,7 +47,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(hostInfo *host.InfoStat) (string, er - }.Pipeline() +@@ -57,7 +57,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(hostInfo *host.InfoStat) (string, er + }.LoggingSubmodulePipeline() if uc.Metrics.Service.LogLevel == "" { - uc.Metrics.Service.LogLevel = "info" @@ -24,12 +11,18 @@ index 1916bcd..a8443ec 100644 } otelConfig, err := otel.ModularConfig{ LogLevel: uc.Metrics.Service.LogLevel, -@@ -126,7 +126,7 @@ func (uc *UnifiedConfig) GenerateFluentBitConfigs(logsDir string, stateDir strin +@@ -137,7 +137,7 @@ func (uc *UnifiedConfig) GenerateFluentBitConfigs(logsDir string, stateDir strin func (l *Logging) generateFluentbitComponents(userAgent string, hostInfo *host.InfoStat) ([]fluentbit.Component, error) { var out []fluentbit.Component if l.Service.LogLevel == "" { - l.Service.LogLevel = "info" + l.Service.LogLevel = "error" } - out = append(out, fluentbit.Service{LogLevel: l.Service.LogLevel}.Component()) - + service := fluentbit.Service{LogLevel: l.Service.LogLevel} + out = append(out, service.Component()) +diff --git a/submodules/fluent-bit b/submodules/fluent-bit +--- a/submodules/fluent-bit ++++ b/submodules/fluent-bit +@@ -1 +1 @@ +-Subproject commit 9c2868fc841e1f0d9e0fd96a4bd8da164741906c ++Subproject commit 9c2868fc841e1f0d9e0fd96a4bd8da164741906c-dirty |