Skip to content

Commit 056839c

Browse files
Andrea Spaccamergify-bot
authored andcommitted
override host on statsd metricset (#29103)
* override host on statsd metricset * changelog (cherry picked from commit 606a7d2)
1 parent 3b89e66 commit 056839c

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
375375
- Preliminary AIX support {pull}27954[27954]
376376
- Register additional name for `storage` metricset in the azure module. {pull}28447[28447]
377377
- Update reference to gosigar pacakge for filesystem windows fix. {pull}28909[28909]
378+
- Override `Host()` on statsd MetricSet {pull}29103[29103]
378379

379380
*Packetbeat*
380381

metricbeat/helper/server/udp/udp.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ func NewUdpServer(base mb.BaseMetricSet) (server.Server, error) {
7171
}, nil
7272
}
7373

74+
func (g *UdpServer) GetHost() string {
75+
return g.udpaddr.String()
76+
}
77+
7478
func (g *UdpServer) Start() error {
7579
listener, err := net.ListenUDP("udp", g.udpaddr)
7680
if err != nil {

x-pack/metricbeat/module/statsd/server/server.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
104104
}, nil
105105
}
106106

107+
// Host returns the hostname or other module specific value that identifies a
108+
// specific host or service instance from which to collect metrics.
109+
func (b *MetricSet) Host() string {
110+
return b.server.(*udp.UdpServer).GetHost()
111+
}
112+
107113
func buildMappings(config []StatsdMapping) (map[string]StatsdMapping, error) {
108114
mappings := make(map[string]StatsdMapping, len(config))
109115
replacer := strings.NewReplacer(".", `\.`, "<", "(?P<", ">", ">[^.]+)")

0 commit comments

Comments
 (0)