File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -122,7 +122,6 @@ fields_sources=\
122122fields : include/fields.go x-pack/apm-server/include/fields.go
123123include/fields.go x-pack/apm-server/include/fields.go : $(MAGE ) magefile.go $(fields_sources )
124124 @$(MAGE ) fields
125- @mv docs/fields.asciidoc docs/legacy/fields.asciidoc
126125
127126config : apm-server.yml apm-server.docker.yml
128127apm-server.yml apm-server.docker.yml : $(MAGE ) magefile.go _meta/beat.yml
Original file line number Diff line number Diff line change @@ -202,21 +202,17 @@ func Fields() error {
202202 xpackFieldsModules := []string {mage .XPackBeatDir ()}
203203 allFieldsModules := append (ossFieldsModules [:], xpackFieldsModules ... )
204204
205- // Create include/fields.go from the OSS-only fields.
205+ // Create include/fields.go and fields.yml from the OSS-only fields,
206+ // and fields.all.yml from all fields.
206207 if err := generateFieldsYAML (mage .FieldsYML , ossFieldsModules ... ); err != nil {
207208 return err
208209 }
209210 if err := mage .GenerateFieldsGo (mage .FieldsYML , fieldsInclude ); err != nil {
210211 return err
211212 }
212-
213- // Create docs/fields.asciidoc from all fields from all license types.
214213 if err := generateFieldsYAML (mage .FieldsAllYML , allFieldsModules ... ); err != nil {
215214 return err
216215 }
217- if err := mage .Docs .FieldDocs (mage .FieldsAllYML ); err != nil {
218- return err
219- }
220216
221217 // Create x-pack/apm-server/include/fields.go from the X-Pack fields.
222218 // These supplement the OSS fields, they don't replace them.
You can’t perform that action at this time.
0 commit comments