Skip to content

feat: add telegraf config section to firehose #84

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
spy16 merged 1 commit into from
Jul 29, 2022
Merged

feat: add telegraf config section to firehose #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions modules/firehose/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ var (
)

type moduleConfig struct {
State string `json:"state"`
ChartVersion string `json:"chart_version"`
State string `json:"state"`
ChartVersion string `json:"chart_version"`
Telegraf map[string]interface{} `json:"telegraf"`
Firehose struct {
Replicas int `json:"replicas"`
KafkaBrokerAddress string `json:"kafka_broker_address"`
Expand Down Expand Up @@ -73,6 +74,9 @@ func (mc moduleConfig) GetHelmReleaseConfig(r resource.Resource) *helm.ReleaseCo
"config": fc.EnvVariables,
},
}
if len(mc.Telegraf) > 0 {
hv["telegraf"] = mc.Telegraf
}
rc.Values = hv

return rc
Expand Down
6 changes: 3 additions & 3 deletions modules/firehose/plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestFirehoseModule_Plan(t *testing.T) {
Name: "test",
Project: "demo",
Spec: resource.Spec{
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","firehose":{"replicas":1,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","telegraf":null,"firehose":{"replicas":1,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
},
State: resource.State{
Status: resource.StatusPending,
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestFirehoseModule_Plan(t *testing.T) {
Name: "test",
Project: "demo",
Spec: resource.Spec{
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","firehose":{"replicas":5,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","telegraf":null,"firehose":{"replicas":5,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
},
State: resource.State{
Status: resource.StatusPending,
Expand All @@ -106,7 +106,7 @@ func TestFirehoseModule_Plan(t *testing.T) {
Name: "test",
Project: "demo",
Spec: resource.Spec{
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","firehose":{"replicas":1,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
Configs: []byte(`{"state":"RUNNING","chart_version":"0.1.1","telegraf":null,"firehose":{"replicas":1,"kafka_broker_address":"localhost:9092","kafka_topic":"test-topic","kafka_consumer_id":"test-consumer-id","env_variables":{}}}`),
},
State: resource.State{
Status: resource.StatusPending,
Expand Down
39 changes: 39 additions & 0 deletions modules/firehose/schema/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,45 @@
"kafka_topic",
"kafka_consumer_id"
]
},
"telegraf": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"default": false
},
"config": {
"type": "object",
"properties": {
"output": {
"type": "object",
"properties": {
"prometheus_remote_write": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"default": false
},
"url": {
"type": "string"
},
"version": {
"type": "string"
}
},
"required": [
"enabled",
"url",
"version"
]
}
}
}
}
}
}
}
},
"required": [
Expand Down