Skip to content

Commit 89e4f81

Browse files
simittsimitt
authored
Beats fields wildcards (#4426)
* Update to elastic/beats@0fda3061815d Pulling in changes from elastic/beats#22521 * Set ElasticLicensed for enabling wildcard support.
1 parent 6bb3f85 commit 89e4f81

File tree

8 files changed

+49
-38
lines changed

8 files changed

+49
-38
lines changed

‎NOTICE.txt‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ Contents of "LICENSE":
639639
--------------------------------------------------------------------
640640
Dependency: github.com/elastic/beats/v7
641641
Version: v7.0.0
642-
Revision: 633285e75a03
642+
Revision: 0fda3061815d
643643
License type (autodetected): Apache-2.0
644644

645645
--------------------------------------------------------------------
@@ -993,8 +993,7 @@ Contents of "NOTICE.txt":
993993

994994
--------------------------------------------------------------------
995995
Dependency: github.com/elastic/gosigar
996-
Version: v0.10.6
997-
Revision: f115143bb233
996+
Version: v0.12.0
998997
License type (autodetected): Apache-2.0
999998
Contents of "NOTICE":
1000999

@@ -1010,7 +1009,7 @@ Contents of "NOTICE":
10101009

10111010
--------------------------------------------------------------------
10121011
Dependency: github.com/fatih/color
1013-
Version: v1.9.0
1012+
Version: v1.10.0
10141013
License type (autodetected): MIT
10151014
Contents of "LICENSE.md":
10161015

@@ -3577,8 +3576,7 @@ License type (autodetected): Apache-2.0
35773576

35783577
--------------------------------------------------------------------
35793578
Dependency: go.elastic.co/apm
3580-
Version: v1.8.1
3581-
Revision: 2aef45b9cf4b
3579+
Version: v1.9.0
35823580
License type (autodetected): Apache-2.0
35833581
Contents of "NOTICE":
35843582

@@ -3909,7 +3907,7 @@ Contents of "LICENSE":
39093907

39103908
--------------------------------------------------------------------
39113909
Dependency: golang.org/x/net
3912-
Revision: 942e2f445f3c
3910+
Revision: 69a78807bb2b
39133911
License type (autodetected): BSD-3-Clause
39143912
Contents of "LICENSE":
39153913

@@ -4011,7 +4009,7 @@ Contents of "LICENSE":
40114009

40124010
--------------------------------------------------------------------
40134011
Dependency: golang.org/x/sys
4014-
Revision: 201ba4db2418
4012+
Revision: 5cba982894dd
40154013
License type (autodetected): BSD-3-Clause
40164014
Contents of "LICENSE":
40174015

‎cmd/root.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,25 @@ var libbeatConfigOverrides = []cfgfile.ConditionalOverride{{
7474
},
7575
}
7676

77-
// NewRootCommand returns the "apm-server" root command.
78-
func NewRootCommand(newBeat beat.Creator) *cmd.BeatsRootCmd {
79-
var runFlags = pflag.NewFlagSet(beatName, pflag.ExitOnError)
80-
settings := instance.Settings{
77+
// DefaultSettings return the default settings for APM Server to pass into
78+
// the GenRootCmdWithSettings.
79+
func DefaultSettings() instance.Settings {
80+
return instance.Settings{
8181
Name: beatName,
8282
IndexPrefix: apmIndexPattern,
8383
Version: defaultBeatVersion,
84-
RunFlags: runFlags,
84+
RunFlags: pflag.NewFlagSet(beatName, pflag.ExitOnError),
8585
Monitoring: report.Settings{
8686
DefaultUsername: "apm_system",
8787
},
8888
IndexManagement: idxmgmt.MakeDefaultSupporter,
8989
Processing: processing.MakeDefaultObserverSupport(false),
9090
ConfigOverrides: libbeatConfigOverrides,
9191
}
92+
}
9293

94+
// NewRootCommand returns the "apm-server" root command.
95+
func NewRootCommand(newBeat beat.Creator, settings instance.Settings) *cmd.BeatsRootCmd {
9396
rootCmd := cmd.GenRootCmdWithSettings(newBeat, settings)
9497
rootCmd.AddCommand(genApikeyCmd(settings))
9598
modifyBuiltinCommands(rootCmd, settings)

‎docs/fields.asciidoc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10501,6 +10501,16 @@ type: keyword
1050110501
Kubernetes node name
1050210502
1050310503
10504+
type: keyword
10505+
10506+
--
10507+
10508+
*`kubernetes.node.hostname`*::
10509+
+
10510+
--
10511+
Kubernetes hostname as reported by the node’s kernel
10512+
10513+
1050410514
type: keyword
1050510515
1050610516
--

‎go.mod‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ require (
1111
github.com/client9/misspell v0.3.5-0.20180309020325-c0b55c823952 // indirect
1212
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
1313
github.com/dlclark/regexp2 v1.4.0 // indirect
14-
github.com/dop251/goja v0.0.0-20201022115936-e21ccf39bfce // indirect
14+
github.com/dop251/goja v0.0.0-20201107160812-7545ac6de48a // indirect
1515
github.com/dop251/goja_nodejs v0.0.0-20200811150831-9bc458b4bbeb // indirect
1616
github.com/dustin/go-humanize v1.0.0
1717
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
18-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201029160358-633285e75a03
18+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201112141016-0fda3061815d
1919
github.com/elastic/go-elasticsearch/v7 v7.5.1-0.20201007132508-ff965d99ba02
2020
github.com/elastic/go-elasticsearch/v8 v8.0.0-20201007143536-4b4020669208
2121
github.com/elastic/go-hdrhistogram v0.1.0
2222
github.com/elastic/go-licenser v0.3.1
2323
github.com/elastic/go-sysinfo v1.4.0 // indirect
2424
github.com/elastic/go-ucfg v0.8.3
25-
github.com/fatih/color v1.9.0 // indirect
25+
github.com/fatih/color v1.10.0 // indirect
2626
github.com/go-sourcemap/sourcemap v2.1.3+incompatible
2727
github.com/gofrs/uuid v3.3.0+incompatible
2828
github.com/gogo/googleapis v1.3.1-0.20190914144012-b8d18e97a9a1 // indirect
@@ -41,7 +41,6 @@ require (
4141
github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd // indirect
4242
github.com/kr/pretty v0.2.0 // indirect
4343
github.com/magefile/mage v1.10.0
44-
github.com/mattn/go-colorable v0.1.8 // indirect
4544
github.com/mitchellh/hashstructure v1.0.0 // indirect
4645
github.com/modern-go/reflect2 v1.0.1
4746
github.com/open-telemetry/opentelemetry-collector v0.2.1-0.20191218182225-c300f1341702
@@ -61,23 +60,22 @@ require (
6160
github.com/uber/tchannel-go v1.16.0 // indirect
6261
github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a // indirect
6362
github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56
64-
go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b
63+
go.elastic.co/apm v1.9.0
6564
go.elastic.co/apm/module/apmelasticsearch v1.7.2
6665
go.elastic.co/apm/module/apmgrpc v1.7.0
6766
go.elastic.co/apm/module/apmhttp v1.7.2
68-
go.elastic.co/ecszap v0.3.0 // indirect
6967
go.elastic.co/fastjson v1.1.0
7068
go.uber.org/atomic v1.7.0
7169
go.uber.org/multierr v1.6.0 // indirect
7270
go.uber.org/zap v1.16.0
7371
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
7472
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
75-
golang.org/x/net v0.0.0-20201029055024-942e2f445f3c
73+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
7674
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
77-
golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 // indirect
75+
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect
7876
golang.org/x/text v0.3.4 // indirect
7977
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
80-
golang.org/x/tools v0.0.0-20201029182919-e7a17c4c1366
78+
golang.org/x/tools v0.0.0-20201111224557-41a3a589386c
8179
google.golang.org/grpc v1.29.1
8280
gopkg.in/yaml.v2 v2.3.0
8381
howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect

‎go.sum‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod
244244
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
245245
github.com/elastic/badger/v2 v2.2007.2-beats h1:/rV4bM6fdYvPQhFf2bHHivIb0H4nX8Or7nkWbQ/Q6Ko=
246246
github.com/elastic/badger/v2 v2.2007.2-beats/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE=
247-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201029160358-633285e75a03 h1:4Q36YfRmEXXe8CnDIwRb66Kakdw47cc+GWrZKHAKuk4=
248-
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201029160358-633285e75a03/go.mod h1:BFRaqnpIoUMcLC5lpdVqJ4RsMyOyoDNZBO4ijlSS1s4=
247+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201112141016-0fda3061815d h1:95Jynkk+2bJWzYYwVsbIJOwcdOS5H7PuV0twdBZmfx4=
248+
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20201112141016-0fda3061815d/go.mod h1:NAy62DuZC0c47apmaLyTV+yg0sjqyrEE8oQcd5vz74Q=
249249
github.com/elastic/ecs v1.6.0 h1:8NmgfnsjmKXh9hVsK3H2tZtfUptepNc3msJOAynhtmc=
250250
github.com/elastic/ecs v1.6.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4=
251251
github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a h1:2NHgf1RUw+f240lpTnLrCp1aBNvq2wDi0E1A423/S1k=
@@ -282,8 +282,8 @@ github.com/elastic/go-ucfg v0.8.3/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+F
282282
github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
283283
github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
284284
github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
285-
github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233 h1:PvAAw8rXlg0maTAhdJznCmlzVZIKPwD2BP1pljuncLA=
286-
github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
285+
github.com/elastic/gosigar v0.12.0 h1:AsdhYCJlTudhfOYQyFNgx+fIVTfrDO0V1ST0vHgiapU=
286+
github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
287287
github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970 h1:rSo6gsz4zOanqtJ5fmZYQJvEJnA5YsVOB25casIwqUw=
288288
github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970/go.mod h1:fGP8eQ6PugKEI0iUETYYtnP6d1pH/bdDMTel1X5ajsU=
289289
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
@@ -300,8 +300,8 @@ github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5I
300300
github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
301301
github.com/fatih/color v1.5.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
302302
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
303-
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
304-
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
303+
github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
304+
github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
305305
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
306306
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
307307
github.com/frankban/quicktest v1.4.1 h1:Wv2VwvNn73pAdFIVUQRXYDFp31lXKbqblIXo/Q5GPSg=
@@ -713,7 +713,6 @@ github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod h1:pYabZ6I
713713
github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
714714
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
715715
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
716-
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
717716
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
718717
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
719718
github.com/mattn/go-shellwords v1.0.7 h1:KqhVjVZomx2puPACkj9vrGFqnp42Htvo9SEAWePHKOs=
@@ -1038,14 +1037,15 @@ go.elastic.co/apm v1.7.0/go.mod h1:IYfi/330rWC5Kfns1rM+kY+RPkIdgUziRF6Cbm9qlxQ=
10381037
go.elastic.co/apm v1.7.2/go.mod h1:tCw6CkOJgkWnzEthFN9HUP1uL3Gjc/Ur6m7gRPLaoH0=
10391038
go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b h1:Sf+V3eV91ZuXjF3824SABFgXU+z4ZEuIX5ikDvt2lCE=
10401039
go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod h1:qoOSi09pnzJDh5fKnfY7bPmQgl8yl2tULdOu03xhui0=
1040+
go.elastic.co/apm v1.9.0 h1:uLOZniTuJ2rU2fFGiNI0ZswzKr9fryHDkNMV8iVDDDI=
1041+
go.elastic.co/apm v1.9.0/go.mod h1:qoOSi09pnzJDh5fKnfY7bPmQgl8yl2tULdOu03xhui0=
10411042
go.elastic.co/apm/module/apmelasticsearch v1.7.2 h1:5STGHLZLSeAzxordMc+dFVKiyVtMmxADOV+TgRaXXJg=
10421043
go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod h1:ZyNFuyWdt42GBZkz0SogoLzDBrBGj4orxpiUuxYeYq8=
10431044
go.elastic.co/apm/module/apmgrpc v1.7.0 h1:CE6zLPSOdSOjcn7AEDJQAULOG2ZT7W+e0i4JzYLSgeY=
10441045
go.elastic.co/apm/module/apmgrpc v1.7.0/go.mod h1:fCqPNInjmGPbjOLXMPrDsGP9Ks39rcg/RDILJtHPwEI=
10451046
go.elastic.co/apm/module/apmhttp v1.7.0/go.mod h1:70/fYU6lgIII213g7As10lm2Ca/ZkGixeJBoyfrGKes=
10461047
go.elastic.co/apm/module/apmhttp v1.7.2 h1:2mRh7SwBuEVLmJlX+hsMdcSg9xaielCLElaPn/+i34w=
10471048
go.elastic.co/apm/module/apmhttp v1.7.2/go.mod h1:sTFWiWejnhSdZv6+dMgxGec2Nxe/ZKfHfz/xtRM+cRY=
1048-
go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ=
10491049
go.elastic.co/ecszap v0.3.0 h1:Zo/Y4sJLqbWDlqCHI4F4Lzeg0Fs4+n5ldVis4h9xV8w=
10501050
go.elastic.co/ecszap v0.3.0/go.mod h1:HTUi+QRmr3EuZMqxPX+5fyOdMNfUu5iPebgfhgsTJYQ=
10511051
go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs=
@@ -1159,8 +1159,8 @@ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLL
11591159
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
11601160
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
11611161
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1162-
golang.org/x/net v0.0.0-20201029055024-942e2f445f3c h1:rpcgRPA7OvNEOdprt2Wx8/Re2cBTd8NPo/lvo3AyMqk=
1163-
golang.org/x/net v0.0.0-20201029055024-942e2f445f3c/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
1162+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
1163+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
11641164
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
11651165
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
11661166
golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1179,6 +1179,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
11791179
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
11801180
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11811181
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1182+
golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
11821183
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
11831184
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
11841185
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1212,7 +1213,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
12121213
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12131214
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12141215
golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1215-
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12161216
golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12171217
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12181218
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1224,8 +1224,8 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
12241224
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12251225
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12261226
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1227-
golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 h1:HlFl4V6pEMziuLXyRkm5BIYq1y1GAbb02pRlWvI54OM=
1228-
golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1227+
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
1228+
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
12291229
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
12301230
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
12311231
golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎include/fields.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/elastic/apm-server/cmd"
2727
)
2828

29-
var rootCmd = cmd.NewRootCommand(beater.NewCreator(beater.CreatorParams{}))
29+
var rootCmd = cmd.NewRootCommand(beater.NewCreator(beater.CreatorParams{}), cmd.DefaultSettings())
3030

3131
func main() {
3232
if err := rootCmd.Execute(); err != nil {

‎x-pack/apm-server/cmd/root.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import (
1515

1616
// NewXPackRootCommand returns the Elastic licensed "apm-server" root command.
1717
func NewXPackRootCommand(newBeat beat.Creator) *libbeatcmd.BeatsRootCmd {
18-
rootCmd := cmd.NewRootCommand(newBeat)
18+
settings := cmd.DefaultSettings()
19+
settings.ElasticLicensed = true
20+
rootCmd := cmd.NewRootCommand(newBeat, settings)
1921
xpackcmd.AddXPack(rootCmd, rootCmd.Name())
2022
if enrollCmd, _, err := rootCmd.Find([]string{"enroll"}); err == nil {
2123
// error is ok => enroll has already been removed

0 commit comments

Comments
 (0)