Skip to content
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.

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

fix: the build vector.yaml indent format error #97

Merged
merged 1 commit into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 25 additions & 22 deletions pkg/builder/vector.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,20 @@ func MakeVectorYaml(
role string,
groupName string,
vectorAggregatorDiscovery string) (string, error) {
vectorAggregatorDiscoveryURI := vectorAggregatorDiscoveryURI(ctx, client, namespace, vectorAggregatorDiscovery)
data := map[string]interface{}{
"LogDir": LogDir,
"Namespace": namespace,
"Cluster": cluster,
"Role": role,
"GroupName": groupName,
"VectorAggregatorAddress": vectorAggregatorDiscoveryURI(ctx, client, namespace, vectorAggregatorDiscovery),
"VectorAggregatorAddress": vectorAggregatorDiscoveryURI,
}
var tmpl = `
api:
return ParseVectorYaml(data)
}

func ParseVectorYaml(data map[string]interface{}) (string, error) {
var tmpl = `api:
enabled: true
data_dir: /zncdata/vector/var
log_schema:
Expand All @@ -110,7 +114,6 @@ sources:
type: "file"
include:
- "{{.LogDir}}/*/*.airlift.json"

transforms:
processed_files_airlift:
inputs:
Expand All @@ -124,27 +127,27 @@ transforms:
.level = parsed_event.level
.thread = parsed_event.thread
extended_logs_files:
inputs:
- processed_files_*
type: remap
source: |
. |= parse_regex!(.file, r'^/zncdata/log/(?P<container>.*?)/(?P<file>.*?)$')
del(.source_type)
inputs:
- processed_files_*
type: remap
source: |
. |= parse_regex!(.file, r'^/zncdata/log/(?P<container>.*?)/(?P<file>.*?)$')
del(.source_type)
extended_logs:
inputs:
- extended_logs_*
type: remap
source: |
.namespace = "{{.Namespace}}"
.cluster = "{{.Cluster}}"
.role = "{{.Role}}"
.roleGroup = "{{.GroupName}}"
inputs:
- extended_logs_*
type: remap
source: |
.namespace = "{{.Namespace}}"
.cluster = "{{.Cluster}}"
.role = "{{.Role}}"
.roleGroup = "{{.GroupName}}"
sinks:
aggregator:
inputs:
- extended_logs
type: vector
address: "{{.VectorAggregatorAddress}}"
inputs:
- extended_logs
type: vector
address: "{{.VectorAggregatorAddress}}"
`
parser := config.TemplateParser{
Value: data,
Expand Down
58 changes: 58 additions & 0 deletions pkg/builder/vector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,61 @@ mkdir -p /zncdata/log/_vector && touch /zncdata/log/_vector/shutdown
assert.NoError(t, err)
assert.Equal(t, expectedArgs, args)
}

func TestVectorYamlFormatter(t *testing.T) {
actualYaml, err := builder.ParseVectorYaml(map[string]interface{}{
"LogDir": "zncdata/log",
"Namespace": "default",
"Cluster": "simple-trino",
"Role": "coordinator",
"GroupName": "default",
"VectorAggregatorAddress": "localhost:8080",
})
expectYaml := `api:
enabled: true
data_dir: /zncdata/vector/var
log_schema:
host_key: "pod"
sources:
files_airlift:
type: "file"
include:
- "zncdata/log/*/*.airlift.json"
transforms:
processed_files_airlift:
inputs:
- files_airlift
type: remap
source: |
parsed_event = parse_json!(string!(.message))
.message = join!(compact([parsed_event.message, parsed_event.stackTrace]), "\n")
.timestamp = parse_timestamp!(parsed_event.timestamp, "%Y-%m-%dT%H:%M:%S.%fZ")
.logger = parsed_event.logger
.level = parsed_event.level
.thread = parsed_event.thread
extended_logs_files:
inputs:
- processed_files_*
type: remap
source: |
. |= parse_regex!(.file, r'^/zncdata/log/(?P<container>.*?)/(?P<file>.*?)$')
del(.source_type)
extended_logs:
inputs:
- extended_logs_*
type: remap
source: |
.namespace = "default"
.cluster = "simple-trino"
.role = "coordinator"
.roleGroup = "default"
sinks:
aggregator:
inputs:
- extended_logs
type: vector
address: "localhost:8080"
`
assert.Equal(t, expectYaml, actualYaml)
assert.NoError(t, err)
}
Loading