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

[fix] Empty label is not allowed in Prometheus #2349

Merged
merged 2 commits into from
Jan 11, 2024

Conversation

borissavelev
Copy link
Contributor

For DM deployment, there are no blackbox instances, and the label value is replaced with an empty string.

New Prometheus versions have a check for that:

FAILED: instance 0 in group 0: no address
, ssh_stdout: Checking /tidb-deploy/prometheus-9090/conf/prometheus.yml , ssh_command: export LANG=C; PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin /tidb-deploy/prometheus-9090/bin/prometheus/promtool check config /tidb-deploy/prometheus-9090/conf/prometheus.yml}, cause: exit status 1: check config failed

For DM deployment there is no blackbox instances and the label value is replaced with an empty string.

New Prometheus versions has a check for that:
FAILED: instance 0 in group 0: no address
, ssh_stdout: Checking /tidb-deploy/prometheus-9090/conf/prometheus.yml
, ssh_command: export LANG=C; PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin /tidb-deploy/prometheus-9090/bin/prometheus/promtool check config /tidb-deploy/prometheus-9090/conf/prometheus.yml}, cause: exit status 1: check config failed
@ti-chi-bot ti-chi-bot bot requested a review from nexustar January 3, 2024 15:15
@CLAassistant
Copy link

CLAassistant commented Jan 3, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

ti-chi-bot bot commented Jan 3, 2024

Welcome @borissavelev! It looks like this is your first PR to pingcap/tiup 🎉

@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 3, 2024
@borissavelev borissavelev changed the title [fix] Empty label is not allowed [fix] Empty label is not allowed in Prometheus Jan 3, 2024
@kaaaaaaang kaaaaaaang added this to the v1.14.1 milestone Jan 9, 2024
@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 9, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jan 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (77e0b53) 55.42% compared to head (dabeb25) 53.36%.

❗ Current head dabeb25 differs from pull request most recent head 1d63294. Consider uploading reports for the commit 1d63294 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2349      +/-   ##
==========================================
- Coverage   55.42%   53.36%   -2.06%     
==========================================
  Files         329      329              
  Lines       34827    34827              
==========================================
- Hits        19300    18582     -718     
- Misses      13217    13983     +766     
+ Partials     2310     2262      -48     
Flag Coverage Δ
cluster 41.93% <ø> (-2.79%) ⬇️
dm 25.45% <ø> (-0.05%) ⬇️
tiup 33.60% <ø> (ø)
unittest 22.34% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kaaaaaaang
Copy link
Collaborator

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Jan 11, 2024
@ti-chi-bot ti-chi-bot bot removed the lgtm label Jan 11, 2024
Copy link
Contributor

ti-chi-bot bot commented Jan 11, 2024

@borissavelev: Your PR was out of date, I have automatically updated it for you.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@kaaaaaaang
Copy link
Collaborator

/lgtm

@ti-chi-bot ti-chi-bot bot added the lgtm label Jan 11, 2024
@kaaaaaaang
Copy link
Collaborator

/approve

Copy link
Contributor

ti-chi-bot bot commented Jan 11, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-09 12:54:18.87648837 +0000 UTC m=+361448.460742043: ☑️ agreed by kaaaaaaang.
  • 2024-01-11 08:31:19.930498595 +0000 UTC m=+518469.514752265: ✖️🔁 reset by ti-chi-bot[bot].
  • 2024-01-11 08:50:18.548072381 +0000 UTC m=+519608.132326053: ☑️ agreed by kaaaaaaang.

Copy link
Contributor

ti-chi-bot bot commented Jan 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaaaaaaang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot merged commit a614582 into pingcap:master Jan 11, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants