Skip to content

Commit 25ba483

Browse files
Expose id attributes map through yaml for overriding entity.service.idAttributeMap (#256)
* Add agent and agent module id to idAttributeMap * vulnerability fix * Expose id attributes map through yaml for overriding
1 parent 72beaee commit 25ba483

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

helm/templates/entity-service-config.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,14 @@ data:
6060
{{- end }}
6161
]
6262
{{- end -}}
63+
{{- if .Values.idAttributes }}
64+
entity.service.idAttributeMap = [
65+
{{- range $i, $v := .Values.idAttributes }}
66+
{{- if gt $i 0 }},{{- end }}
67+
{
68+
"scope": {{ $v.scope | quote }},
69+
"attribute": {{ $v.attribute | quote }},
70+
}
71+
{{- end }}
72+
]
73+
{{- end -}}

helm/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ entityServiceConfig:
107107
port: 9012
108108

109109
attributes: []
110+
idAttributes:
111+
- scope: API
112+
attribute: API.id
113+
- scope: SERVICE
114+
attribute: SERVICE.id
115+
- scope: BACKEND
116+
attribute: BACKEND.id
110117
extraAttributes: []
111118

112119
logConfig:

owasp-suppressions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<packageUrl regex="true">^pkg:maven/com\.squareup\.wire/wire\-schema\-jvm@.*$</packageUrl>
4040
<cpe>cpe:/a:wire:wire</cpe>
4141
</suppress>
42+
<suppress until="2023-11-30Z">
43+
<notes><![CDATA[
44+
file name: netty-handler-4.1.94.Final.jar
45+
]]></notes>
46+
<packageUrl regex="true">^pkg:maven/io\.netty/netty.*@.*$</packageUrl>
47+
<vulnerabilityName>CVE-2023-4586</vulnerabilityName>
48+
</suppress>
4249
</suppressions>
4350

4451

0 commit comments

Comments
 (0)