Skip to content

Commit 72ac4e9

Browse files
authored
Metadata filter tile update (#253)
* updated tile to add fields for metadata filter, rlp-retries, queue monitoring, updated unit-tests
1 parent f933338 commit 72ac4e9

File tree

3 files changed

+46
-11
lines changed

3 files changed

+46
-11
lines changed

splunknozzle/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func NewConfigFromCmdFlags(version, branch, commit, buildos string) *Config {
149149
kingpin.Flag("hec-batch-size", "Batchsize of the events pushing to HEC").
150150
OverrideDefaultFromEnvar("HEC_BATCH_SIZE").Default("100").IntVar(&c.BatchSize)
151151
kingpin.Flag("rlp-gateway-retries", "Number of retries to connect to RLP gateway").
152-
OverrideDefaultFromEnvar("RLP_GATEWAY_RETRIES").Default("10").IntVar(&c.RLPGatewayRetries)
152+
OverrideDefaultFromEnvar("RLP_GATEWAY_RETRIES").Default("5").IntVar(&c.RLPGatewayRetries)
153153
kingpin.Flag("hec-retries", "Number of retries before dropping events").
154154
OverrideDefaultFromEnvar("HEC_RETRIES").Default("5").IntVar(&c.Retries)
155155
kingpin.Flag("hec-workers", "How many workers (concurrency) when post data to HEC").
@@ -161,7 +161,7 @@ func NewConfigFromCmdFlags(version, branch, commit, buildos string) *Config {
161161
OverrideDefaultFromEnvar("ENABLE_EVENT_TRACING").Default("false").BoolVar(&c.TraceLogging)
162162
kingpin.Flag("debug", "Enable debug mode: forward to standard out instead of splunk").
163163
OverrideDefaultFromEnvar("DEBUG").Default("false").BoolVar(&c.Debug)
164-
kingpin.Flag("status-monitor-interval", "Print information for monitoring at every interval").
164+
kingpin.Flag("status-monitor-interval", "Time interval for monitoring consumer-queue-size status to help with back-pressure insights").
165165
OverrideDefaultFromEnvar("STATUS_MONITOR_INTERVAL").Default("0s").DurationVar(&c.StatusMonitorInterval)
166166

167167
kingpin.Parse()

splunknozzle/config_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var _ = Describe("Config", func() {
5959

6060
os.Setenv("FLUSH_INTERVAL", "43s")
6161
os.Setenv("CONSUMER_QUEUE_SIZE", "15000")
62-
os.Setenv("RLP_GATEWAY_RETRIES", "10")
62+
os.Setenv("RLP_GATEWAY_RETRIES", "5")
6363
os.Setenv("HEC_RETRIES", "10")
6464
os.Setenv("HEC_WORKERS", "5")
6565
os.Setenv("SPLUNK_VERSION", "6.2")
@@ -102,7 +102,7 @@ var _ = Describe("Config", func() {
102102
Expect(c.FlushInterval).To(Equal(43 * time.Second))
103103
Expect(c.QueueSize).To(Equal(15000))
104104
Expect(c.BatchSize).To(Equal(100))
105-
Expect(c.RLPGatewayRetries).To(Equal(10))
105+
Expect(c.RLPGatewayRetries).To(Equal(5))
106106
Expect(c.Retries).To(Equal(10))
107107
Expect(c.HecWorkers).To(Equal(5))
108108
Expect(c.SplunkVersion).To(Equal("6.2"))
@@ -141,7 +141,7 @@ var _ = Describe("Config", func() {
141141
Expect(c.FlushInterval).To(Equal(5 * time.Second))
142142
Expect(c.QueueSize).To(Equal(10000))
143143
Expect(c.BatchSize).To(Equal(100))
144-
Expect(c.RLPGatewayRetries).To(Equal(10))
144+
Expect(c.RLPGatewayRetries).To(Equal(5))
145145
Expect(c.Retries).To(Equal(5))
146146
Expect(c.HecWorkers).To(Equal(8))
147147
Expect(c.SplunkVersion).To(Equal("7.2"))

tile/tile.yml

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ forms:
106106
- name: hec_retries
107107
type: integer
108108
label: HEC Retries
109-
default: 5
109+
default: 3
110110
description: The retry count for sending events to the Splunk platform. Events not successfully sent after this number of retries will be dropped, causing data loss.
111111
- name: hec_batch_size
112112
type: integer
@@ -158,16 +158,51 @@ forms:
158158
label: Firehose Keep Alive
159159
description: Keep alive duration (in sec, min or hour) for the firehose consumer.
160160
default: 25s
161-
- name: add_app_info
162-
type: boolean
163-
default: false
164-
label: Add App Information
165-
description: Enriches raw data with application metadata, such as application name, space name, org name, etc.
161+
- name: status_monitor_interval
162+
type: string
163+
label: Monitor Queue Size
164+
default: 0s
165+
description: Time interval for monitoring consumer-queue-size status to help with back-pressure insights.
166+
- name: rlp_gateway_retries
167+
type: integer
168+
label: RLP Gateway Retries
169+
default: 5
170+
description: Number of retries to connect to RLP gateway
166171
- name: enable_event_tracing
167172
type: boolean
168173
label: Enable Event Tracing
169174
default: false
170175
description: Enables data loss tracing.
176+
- name: add_app_info
177+
type: boolean
178+
default: false
179+
label: Add App Information
180+
description: Enriches event data with application metadata, such as application name, space name/ id, org name/id.
181+
- name: add_app_name
182+
type: boolean
183+
default: true
184+
label: Add App Name
185+
description: Enriches event raw data with application name. (Requires Add App Info feature enabled)
186+
- name: add_org_name
187+
type: boolean
188+
default: true
189+
label: Add Org Name
190+
description: Enriches event raw data with cf-org name. (Requires Add App Info feature enabled)
191+
- name: add_org_guid
192+
type: boolean
193+
default: true
194+
label: Add Org ID
195+
description: Enriches event raw data with cf-org id. (Requires Add App Info feature enabled)
196+
- name: add_space_name
197+
type: boolean
198+
default: true
199+
label: Add Space Name
200+
description: Enriches event raw data with cf-space name. (Requires Add App Info feature enabled)
201+
- name: add_space_guid
202+
type: boolean
203+
default: true
204+
label: Add Space ID
205+
description: Enriches event raw data with cf-space id. (Requires Add App Info feature enabled)
171206
- name: ignore_missing_app
172207
type: boolean
173208
label: Ignore Missing App

0 commit comments

Comments
 (0)