Skip to content
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

Jump to bottom

Fix pipeline name refs #4489

Merged
merged 3 commits into from
Dec 4, 2020
Merged

Fix pipeline name refs #4489

merged 3 commits into from
Dec 4, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Dec 3, 2020

Motivation/summary

When kibana installs pipelines trough fleet integrations, it renames then with datastream and integration version.
This renames the referenced names to match the ones generated by Kibana.

Checklist

I have considered changes for:

How to test these changes

Related issues

@apmmachine
Copy link
Contributor

apmmachine commented Dec 3, 2020 •
edited
Loading

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: Pull request #4489 updated

  • Reason: Aborted from #7

  • Start Time: 2020-12-04T08:05:09.878+0000

  • Duration: 3 min 29 sec

  • Commit: fcb6130

Log output

Expand to view the last 100 lines of log output 

[2020-12-04T08:08:35.468Z] go: downloading go.elastic.co/apm/module/apmelasticsearch v1.7.2
[2020-12-04T08:08:35.468Z] go: downloading github.com/gogo/protobuf v1.3.1
[2020-12-04T08:08:35.468Z] go: downloading github.com/gogo/googleapis v1.3.1-0.20190914144012-b8d18e97a9a1
[2020-12-04T08:08:35.468Z] go: downloading github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
[2020-12-04T08:08:35.468Z] go: downloading k8s.io/api v0.18.3
[2020-12-04T08:08:35.468Z] go: downloading go.uber.org/zap v1.16.0
[2020-12-04T08:08:35.468Z] go: downloading howett.net/plist v0.0.0-20201026045517-117a925f2150
[2020-12-04T08:08:35.468Z] go: downloading github.com/google/gofuzz v1.1.0
[2020-12-04T08:08:35.468Z] go: downloading github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e
[2020-12-04T08:08:35.468Z] go: downloading github.com/cespare/xxhash v1.1.0
[2020-12-04T08:08:35.468Z] go: downloading github.com/cespare/xxhash/v2 v2.1.1
[2020-12-04T08:08:35.468Z] go: downloading github.com/mattn/go-colorable v0.1.8
[2020-12-04T08:08:35.468Z] go: downloading k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
[2020-12-04T08:08:35.468Z] go: downloading github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
[2020-12-04T08:08:35.468Z] go: downloading github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6
[2020-12-04T08:08:35.468Z] go: downloading github.com/json-iterator/go v1.1.10
[2020-12-04T08:08:35.468Z] go: downloading github.com/hashicorp/golang-lru v0.5.3
[2020-12-04T08:08:35.468Z] go: downloading github.com/fatih/color v1.10.0
[2020-12-04T08:08:35.468Z] go: downloading github.com/golang/protobuf v1.4.2
[2020-12-04T08:08:35.468Z] go: downloading github.com/imdario/mergo v0.3.6
[2020-12-04T08:08:35.468Z] go: downloading github.com/patrickmn/go-cache v2.1.0+incompatible
[2020-12-04T08:08:35.468Z] go: downloading go.elastic.co/apm/module/apmgrpc v1.7.0
[2020-12-04T08:08:35.468Z] go: downloading github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24
[2020-12-04T08:08:35.469Z] go: downloading github.com/hashicorp/go-multierror v1.1.0
[2020-12-04T08:08:35.469Z] go: downloading go.elastic.co/ecszap v0.3.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/elastic/go-txfile v0.0.7
[2020-12-04T08:08:35.469Z] go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
[2020-12-04T08:08:35.469Z] go: downloading github.com/uber/tchannel-go v1.16.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985
[2020-12-04T08:08:35.469Z] go: downloading google.golang.org/protobuf v1.23.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/docker/distribution v2.7.1+incompatible
[2020-12-04T08:08:35.469Z] go: downloading golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
[2020-12-04T08:08:35.469Z] go: downloading github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
[2020-12-04T08:08:35.469Z] go: downloading github.com/armon/go-radix v1.0.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/docker/go-units v0.4.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/hashicorp/errwrap v1.1.0
[2020-12-04T08:08:35.469Z] go: downloading gopkg.in/inf.v0 v0.9.1
[2020-12-04T08:08:35.469Z] go: downloading github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483
[2020-12-04T08:08:35.469Z] go: downloading github.com/grpc-ecosystem/grpc-gateway v1.13.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20
[2020-12-04T08:08:35.469Z] go: downloading github.com/containerd/containerd v1.3.3
[2020-12-04T08:08:35.469Z] go: downloading k8s.io/klog v1.0.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/google/go-cmp v0.5.2
[2020-12-04T08:08:35.469Z] go: downloading gopkg.in/yaml.v2 v2.3.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/census-instrumentation/opencensus-proto v0.2.1
[2020-12-04T08:08:35.469Z] go: downloading github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
[2020-12-04T08:08:35.469Z] go: downloading github.com/davecgh/go-spew v1.1.1
[2020-12-04T08:08:35.469Z] go: downloading github.com/miekg/dns v1.1.15
[2020-12-04T08:08:35.469Z] go: downloading github.com/modern-go/reflect2 v1.0.1
[2020-12-04T08:08:35.469Z] go: downloading github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e
[2020-12-04T08:08:35.469Z] go: downloading github.com/xdg/stringprep v1.0.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970
[2020-12-04T08:08:35.469Z] go: downloading golang.org/x/text v0.3.4
[2020-12-04T08:08:35.469Z] go: downloading github.com/mattn/go-isatty v0.0.12
[2020-12-04T08:08:35.469Z] go: downloading github.com/prometheus/procfs v0.2.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/elastic/go-lumber v0.1.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/dlclark/regexp2 v1.4.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/sirupsen/logrus v1.4.2
[2020-12-04T08:08:35.469Z] go: downloading sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e
[2020-12-04T08:08:35.469Z] go: downloading golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
[2020-12-04T08:08:35.469Z] go: downloading sigs.k8s.io/structured-merge-diff/v3 v3.0.0
[2020-12-04T08:08:35.469Z] go: downloading github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd
[2020-12-04T08:08:35.469Z] 
[2020-12-04T08:08:35.469Z] Makefile:250: recipe for target 'build/linux/mage' failed
[2020-12-04T08:08:35.469Z] make: *** [build/linux/mage] Error 1
[2020-12-04T08:08:35.469Z] + cleanup
[2020-12-04T08:08:35.469Z] + rm -rf /tmp/tmp.uawGQi0buo
[2020-12-04T08:08:35.476Z] script returned exit code 2
[2020-12-04T08:08:36.768Z] Stage "Build and Test" skipped due to earlier failure(s)
[2020-12-04T08:08:36.882Z] Stage "linux build" skipped due to earlier failure(s)
[2020-12-04T08:08:36.883Z] Stage "windows build-test" skipped due to earlier failure(s)
[2020-12-04T08:08:36.884Z] Stage "OSX build-test" skipped due to earlier failure(s)
[2020-12-04T08:08:36.885Z] Stage "Unit Test" skipped due to earlier failure(s)
[2020-12-04T08:08:36.885Z] Stage "System and Environment Tests" skipped due to earlier failure(s)
[2020-12-04T08:08:36.886Z] Stage "Benchmarking" skipped due to earlier failure(s)
[2020-12-04T08:08:36.887Z] Stage "Check kibana Obj. Updated" skipped due to earlier failure(s)
[2020-12-04T08:08:36.888Z] Stage "Hey-Apm" skipped due to earlier failure(s)
[2020-12-04T08:08:36.889Z] Stage "Package" skipped due to earlier failure(s)
[2020-12-04T08:08:36.890Z] Stage "APM Integration Tests" skipped due to earlier failure(s)
[2020-12-04T08:08:36.934Z] Stage "Package" skipped due to earlier failure(s)
[2020-12-04T08:08:37.107Z] Failed in branch linux build
[2020-12-04T08:08:37.108Z] Failed in branch windows build-test
[2020-12-04T08:08:37.109Z] Failed in branch OSX build-test
[2020-12-04T08:08:37.110Z] Failed in branch Unit Test
[2020-12-04T08:08:37.110Z] Failed in branch System and Environment Tests
[2020-12-04T08:08:37.111Z] Failed in branch Benchmarking
[2020-12-04T08:08:37.112Z] Failed in branch Check kibana Obj. Updated
[2020-12-04T08:08:37.113Z] Failed in branch Hey-Apm
[2020-12-04T08:08:37.113Z] Failed in branch APM Integration Tests
[2020-12-04T08:08:37.178Z] Stage "Package" skipped due to earlier failure(s)
[2020-12-04T08:08:37.254Z] Failed in branch Package
[2020-12-04T08:08:37.558Z] Running on Jenkins in /var/lib/jenkins/workspace/pm-server_apm-server-mbp_PR-4489
[2020-12-04T08:08:37.870Z] [INFO] getVaultSecret: Getting secrets
[2020-12-04T08:08:38.113Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-12-04T08:08:38.902Z] + chmod 755 generate-build-data.sh
[2020-12-04T08:08:38.902Z] + ./generate-build-data.sh https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4489/ https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4489/runs/6 ABORTED 208762
[2020-12-04T08:08:39.453Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4489/runs/6/steps/?limit=10000 -o steps-info.json
[2020-12-04T08:08:40.004Z] INFO: curl https://apm-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/apm-server/apm-server-mbp/PR-4489/runs/6/tests/?status=FAILED -o tests-errors.json
[2020-12-04T08:08:40.004Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2020-12-04T08:08:40.915Z] Retry 2/3 exited 22, retrying in 2 seconds...

@jalvz jalvz force-pushed the fix-pipeline-name-refs branch 2 times, most recently from f05054d to c55ba10 Compare December 3, 2020 13:12
@jalvz jalvz force-pushed the fix-pipeline-name-refs branch from c55ba10 to 3a878b7 Compare December 3, 2020 13:12
axw
axw reviewed Dec 4, 2020
View reviewed changes
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renaming looks fine, but it's unclear to me why ingest_pipeline has been removed from the data stream manifests.

apmpackage/cmd/gen-package/genpipelines.go Show resolved Hide resolved
apmpackage/apm/0.1.0/data_stream/internal_metrics/manifest.yml Show resolved Hide resolved
@jalvz jalvz merged commit 945e483 into elastic:master Dec 4, 2020
@apmmachine
Copy link
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #4489 updated

  • Start Time: 2020-12-04T08:06:14.631+0000

  • Duration: 41 min 53 sec

Test stats 🧪

Test Results
Failed 0
Passed 4621
Skipped 139
Total 4760

Steps errors 3

Expand to view the steps failures

Compress

  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage

Compress

  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests

Test Sync

  • Took 3 min 9 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@jalvz jalvz added the bug label Dec 4, 2020
@jalvz jalvz mentioned this pull request Dec 8, 2020
Closed
15 tasks
jalvz added a commit to jalvz/apm-server that referenced this pull request Dec 15, 2020
@jalvz
Fix pipeline name refs (elastic#4489)
606a914 
Update pipeline names referenced in default.json files to match the one generated by Fleet.
@jalvz jalvz mentioned this pull request Dec 15, 2020
Merged
jalvz added a commit that referenced this pull request Dec 15, 2020
@jalvz
[7.x] Fix pipeline name refs and remove service datasets (#4489, #4491)…
2f3eb92 
… (#4537)

* Fix pipeline name refs (#4489)

Update pipeline names referenced in default.json files to match the one generated by Fleet.

* Remove service datasets (#4491)

Also rename data streams and fix the profiles pipelines referenced names
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@axw axw axw approved these changes

Assignees
No one assigned
Labels
bug test-plan-skip v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jalvz @apmmachine @axw @simitt