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

feat(obs): Improve builtin grafana setup to have traces and logs linked (backport #2716) #2723

Merged
merged 1 commit into from
Sep 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2021

This is an automatic backport of pull request #2716 done by Mergify.


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/

…ed (#2716)

- Add datasources for jaeger and loki in `metrics install`.
    It simplifies life after and doesn't cause any problems if there's no jaeger installed.
- Add traces to access log format
- Extract correct timestamp, mesh and add node_id as a key in promtail
- Add links between traces and access logs in grafana.

Signed-off-by: Charly Molter <charly.molter@konghq.com>
(cherry picked from commit dfe1e38)
@mergify mergify bot requested a review from a team as a code owner September 2, 2021 10:04
@codecov-commenter
Copy link

Codecov Report

Merging #2723 (7eea202) into release-1.3 (6395917) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-1.3    #2723      +/-   ##
===============================================
+ Coverage        52.25%   52.27%   +0.02%     
===============================================
  Files              865      865              
  Lines            49289    49293       +4     
===============================================
+ Hits             25755    25769      +14     
+ Misses           21448    21434      -14     
- Partials          2086     2090       +4     
Impacted Files Coverage Δ
...s/envoy/listeners/v3/http_access_log_configurer.go 75.00% <ø> (ø)
...ctl/cmd/install/context/install_metrics_context.go 100.00% <100.00%> (ø)
app/kumactl/cmd/install/install_metrics.go 76.31% <100.00%> (+0.64%) ⬆️
pkg/xds/cache/once/cache.go 87.17% <0.00%> (-7.70%) ⬇️
pkg/core/resources/manager/cache.go 81.81% <0.00%> (ø)
pkg/xds/generator/direct_access_proxy_generator.go 83.90% <0.00%> (+1.14%) ⬆️
pkg/core/resources/model/rest/resource.go 69.23% <0.00%> (+1.28%) ⬆️
pkg/kds/client/sink.go 52.27% <0.00%> (+4.54%) ⬆️
pkg/core/bootstrap/autoconfig.go 54.46% <0.00%> (+8.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6395917...7eea202. Read the comment docs.

@lahabana lahabana merged commit 51768c8 into release-1.3 Sep 2, 2021
@lahabana lahabana deleted the mergify/bp/release-1.3/pr-2716 branch September 2, 2021 11:22
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