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.

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

[7.x] Add support for dynamic histogram metrics (backport #5239) #5352

Merged
merged 2 commits into from
May 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 27, 2021

This is an automatic backport of pull request #5239 done by Mergify.
Cherry-pick of 91645bd has failed:

On branch mergify/bp/7.x/pr-5239
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 91645bde.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   apmpackage/apm/0.2.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	modified:   apmpackage/apm/0.2.0/data_stream/app_metrics/elasticsearch/ingest_pipeline/default.json
	modified:   apmpackage/apm/0.2.0/data_stream/app_metrics/fields/fields.yml
	new file:   apmpackage/apm/0.2.0/data_stream/error_logs/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	modified:   apmpackage/apm/0.2.0/data_stream/error_logs/elasticsearch/ingest_pipeline/default.json
	new file:   apmpackage/apm/0.2.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	modified:   apmpackage/apm/0.2.0/data_stream/internal_metrics/elasticsearch/ingest_pipeline/default.json
	modified:   apmpackage/apm/0.2.0/data_stream/internal_metrics/fields/fields.yml
	new file:   apmpackage/apm/0.2.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	modified:   apmpackage/apm/0.2.0/data_stream/profile_metrics/elasticsearch/ingest_pipeline/default.json
	new file:   apmpackage/apm/0.2.0/data_stream/traces/elasticsearch/ingest_pipeline/apm_metrics_dynamic_template.json
	modified:   apmpackage/apm/0.2.0/data_stream/traces/elasticsearch/ingest_pipeline/default.json
	modified:   apmpackage/apm/0.2.0/docs/README.md
	modified:   docs/fields.asciidoc
	modified:   ingest/pipeline/definition.json
	modified:   ingest/pipeline/definition.yml
	modified:   model/metricset.go
	modified:   model/metricset/_meta/fields.yml
	modified:   model/metricset_test.go
	modified:   processor/otel/metrics.go
	modified:   processor/otel/metrics_test.go
	modified:   systemtest/approvals/TestOTLPGRPCMetrics.approved.json
	modified:   systemtest/otlp_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelogs/head.asciidoc
	both modified:   include/fields.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* model/metricset: add "histogram" dynamic_template

* ingest/pipeline: handle metric descriptions

* model: add metric type and unit

* processor/otel: translate histogram metrics

* Update changelog

* processor/otel: fix histogram translation

Handle histogram bucket counts correctly, following the
approach taken by Prometheus.

* processor/otel: fix merge

* processor/otel: use appropriate slice cap

(cherry picked from commit 91645bd)

# Conflicts:
#	changelogs/head.asciidoc
#	include/fields.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 27, 2021
@mergify mergify bot assigned axw May 27, 2021
@apmmachine
Copy link
Contributor

apmmachine commented May 27, 2021

💚 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 #5352 updated

  • Start Time: 2021-05-27T02:51:09.487+0000

  • Duration: 51 min 5 sec

  • Commit: 36df153

Test stats 🧪

Test Results
Failed 0
Passed 4787
Skipped 121
Total 4908

Trends 🧪

Image of Build Times

Image of Tests

@axw axw removed the conflicts There is a conflict in the backported pull request label May 27, 2021
@axw axw merged commit d51154f into 7.x May 27, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5239 branch May 27, 2021 03:43
axw added a commit that referenced this pull request May 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants