Skip to content

Entity serivce changes to move configs to config-bootstrapper docker … #10

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

Merged
samarth-gupta-traceable merged 3 commits into from
Aug 5, 2020
Merged

Entity serivce changes to move configs to config-bootstrapper docker … #10

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
125d309
Entity serivce changes to move configs to config-bootstrapper docker …
samarth-gupta-traceable Aug 3, 2020
bca765f
Update config bootstrapper chart version
samarth-gupta-traceable Aug 5, 2020
2bfbb69
update CB version
samarth-gupta-traceable Aug 5, 2020
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
54 changes: 52 additions & 2 deletions entity-service/src/main/resources/configs/common/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,58 @@ entity.service.config = {
}
}
}
# This should be completely driven based on config given in app packaging.
entity.service.attributeMap = []
entity.service.attributeMap = [
{
"scope": "API",
"name": "API.id",
"subDocPath": "entityId"
},
{
"scope": "API",
"name": "API.name",
"subDocPath": "entityName"
},
{
"scope": "API",
"name": "API.apiType",
"subDocPath": "attributes.API_TYPE"
},
{
"scope": "API",
"name": "API.httpMethod",
"subDocPath": "attributes.http_method"
},
{
"scope": "API",
"name": "API.httpUrl",
"subDocPath": "attributes.API_NAME"
},
{
"scope": "API",
"name": "API.serviceId",
"subDocPath": "attributes.SERVICE_ID"
},
{
"scope": "API",
"name": "API.createdTime",
"subDocPath": "createdTime"
},
{
"scope": "API",
"name": "API.apiDiscoveryState",
"subDocPath": "attributes.api_discovery_state"
},
{
"scope": "SERVICE",
"name": "SERVICE.id",
"subDocPath": "entityId"
},
{
"scope": "SERVICE",
"name": "SERVICE.name",
"subDocPath": "entityName"
}
]

metrics.reporter {
prefix = org.hypertrace.entity.service.EntityService
Expand Down
2 changes: 1 addition & 1 deletion helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ version: 0.1.0
dependencies:
- name: config-bootstrapper
repository: "https://storage.googleapis.com/hypertrace-helm-charts"
version: 0.1.0
version: 0.1.6
45 changes: 0 additions & 45 deletions helm/configs/1_entityrelationshiptypes.conf
View file
Open in desktop

This file was deleted.

109 changes: 0 additions & 109 deletions helm/configs/1_entitytypes.conf
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions helm/templates/entity-bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
{{- if ( index .Values "config-bootstrapper" "configurationCommands" ) }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ index .Values "config-bootstrapper" "job" "prefix" }}-bootstrap-configs
labels:
release: {{ .Release.Name }}
data:
{{- range $path, $bytes := .Files.Glob "configs/**" }}
{{- $name := base ($path) }}
{{ tpl ($.Files.Glob (printf "configs/%s" $name)).AsConfig $ | indent 2 }}
{{- end }}
{{- if .Values.configurationCommands }}
{{ uuidv4 }}: |
{{- range $key, $value := .Values.configurationCommands }}
{{- range $key, $value := ( index .Values "config-bootstrapper" "configurationCommands" ) }}
{{ $key }}: |
{{ $value | indent 4 }}
{{- end }}
{{- end }}
36 changes: 2 additions & 34 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,38 +80,7 @@ entityServiceConfig:
mongoHost: mongo
mongoUrl: ""

attributes:
- scope: API
name: API.id
subDocPath: entityId
- scope: API
name: API.name
subDocPath: entityName
- scope: API
name: API.apiType
subDocPath: attributes.API_TYPE
- scope: API
name: API.httpMethod
subDocPath: attributes.http_method
- scope: API
name: API.httpUrl
subDocPath: attributes.API_NAME
- scope: API
name: API.serviceId
subDocPath: attributes.SERVICE_ID
- scope: API
name: API.createdTime
subDocPath: createdTime
- scope: API
name: API.apiDiscoveryState
subDocPath: attributes.api_discovery_state
- scope: SERVICE
name: SERVICE.id
subDocPath: entityId
- scope: SERVICE
name: SERVICE.name
subDocPath: entityName

attributes: []
extraAttributes: []

logConfig:
Expand All @@ -126,5 +95,4 @@ logConfig:
config-bootstrapper:
job:
prefix: entity

configurationCommands: {}
configurationCommands: {}