diff --git a/deploy/helm/tests/swo-agent-statefulset_test.yaml b/deploy/helm/tests/swo-agent-statefulset_test.yaml index c750e924..15323b95 100644 --- a/deploy/helm/tests/swo-agent-statefulset_test.yaml +++ b/deploy/helm/tests/swo-agent-statefulset_test.yaml @@ -10,7 +10,7 @@ tests: asserts: - equal: path: spec.template.spec.containers[0].image - value: solarwinds/swo-agent:v2.10.68 + value: solarwinds/swo-agent:v2.10.85 - it: Image should be correct when overriden tag template: swo-agent-statefulset.yaml set: diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml index a4f9fd83..a44b007d 100644 --- a/deploy/helm/values.yaml +++ b/deploy/helm/values.yaml @@ -230,7 +230,7 @@ otel: # This filter is applied after metric processing, it is the place where metrics could be filtered out # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor for configuration reference # With filter conditions we build a global blacklist. So if we exclude data, let's say by specific namespace, - # we need to allow other data to be collected. The following example excludes all data from namespace 'foo', + # we need to allow other data to be collected. The following example excludes all data from namespaces other than 'foo', # but we need to add a condition that allows data without namespace attribute to be collected. # filter: # metric: @@ -345,7 +345,7 @@ otel: # This filter is applied after events processing, it is the place where events could be filtered out # https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/filterprocessor for configuration reference # With filter conditions we build a global blacklist. So if we exclude data, let's say by specific namespace, - # we need to allow other data to be collected. The following example excludes all data from namespace 'foo', + # we need to allow other data to be collected. The following example excludes all data from namespaces other than 'foo', # but we need to add a condition that allows data without namespace attribute to be collected. # filter: # log_record: @@ -513,7 +513,7 @@ otel: # default (since k8s collector 4.0.0) is to collect all logs # # With filter conditions we build a global blacklist. So if we exclude data, let's say by specific namespace, - # we need to allow other data to be collected. The following example excludes all data from namespace 'foo', + # we need to allow other data to be collected. The following example excludes all data from namespaces other than 'foo', # but we need to add a condition that allows data without namespace attribute to be collected. # filter: # log_record: @@ -680,7 +680,7 @@ swoagent: enabled: false image: repository: solarwinds/swo-agent - tag: "v2.10.68" + tag: "v2.10.85" pullPolicy: IfNotPresent resources: limits: diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 92e58381..8fb7fb1c 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -63,7 +63,7 @@ require ( go.opentelemetry.io/otel/log v0.7.0 go.opentelemetry.io/otel/sdk v1.31.0 go.opentelemetry.io/otel/sdk/log v0.7.0 - golang.org/x/sys v0.26.0 + golang.org/x/sys v0.28.0 google.golang.org/grpc v1.67.1 ) @@ -294,14 +294,14 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.28.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/term v0.25.0 // indirect - golang.org/x/text v0.19.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.23.0 // indirect gonum.org/v1/gonum v0.15.1 // indirect diff --git a/src/cmd/go.sum b/src/cmd/go.sum index 533bed0d..4c7d3925 100644 --- a/src/cmd/go.sum +++ b/src/cmd/go.sum @@ -955,8 +955,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1061,8 +1061,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1128,8 +1128,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1138,8 +1138,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1152,8 +1152,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/tests/deploy/base/mocks.yaml b/tests/deploy/base/mocks.yaml index bd41dadc..16841ddf 100644 --- a/tests/deploy/base/mocks.yaml +++ b/tests/deploy/base/mocks.yaml @@ -36,32 +36,20 @@ data: extensions: health_check: endpoint: 0.0.0.0:13133 - memory_ballast: - size_mib: 204 processors: filter/events: - logs: - include: - match_type: strict - resource_attributes: - - key: sw.k8s.log.type - value: event + logs: + log_record: + - not(IsMatch(resource.attributes["sw.k8s.log.type"], "event")) filter/manifests: - logs: - include: - match_type: strict - resource_attributes: - - key: sw.k8s.log.type - value: manifest + logs: + log_record: + - not(IsMatch(resource.attributes["sw.k8s.log.type"], "manifest")) filter/logs: - logs: - exclude: - match_type: strict - resource_attributes: - - key: sw.k8s.log.type - value: event - - key: sw.k8s.log.type - value: manifest + logs: + log_record: + - IsMatch(resource.attributes["sw.k8s.log.type"], "event") + - IsMatch(resource.attributes["sw.k8s.log.type"], "manifest") receivers: otlp: protocols: @@ -70,7 +58,6 @@ data: service: extensions: - health_check - - memory_ballast pipelines: metrics: exporters: @@ -148,8 +135,13 @@ spec: - --config=/conf/relay.yaml securityContext: runAsUser: 0 - image: "otel/opentelemetry-collector-contrib:0.107.0" + image: "otel/opentelemetry-collector-contrib:0.113.0" imagePullPolicy: IfNotPresent + env: + - name: GOMEMLIMIT + valueFrom: + resourceFieldRef: + resource: limits.memory ports: - name: otlp containerPort: 9082