This repository has been archived by the owner on Jul 19, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 73
chore: Ensure presence of service_name label #745
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
korniltsev
force-pushed
the
chore/service-name
branch
from
June 5, 2023 11:52
12825bc
to
b6a2dc5
Compare
petethepig
reviewed
Jun 6, 2023
pkg/agent/profiles.go
Outdated
@@ -167,7 +169,15 @@ func populateLabels(lset labels.Labels, cfg ScrapeConfig) (res, orig labels.Labe | |||
lb.Set(model.InstanceLabel, addr) | |||
} | |||
|
|||
if serviceName := lset.Get(phlaremodel.LabelNameServiceName); serviceName == "" { | |||
if serviceName = lset.Get(phlaremodel.LabelNameServiceNameK8s); serviceName == "" { | |||
return nil, nil, errors.New("service_name label is not specified") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So if I don't have either of these it will throw an error on ingestion scraping, right?
Maybe this was discussed already and there's consensus, in which case ignore me, but I would prefer we default to some values like "unspecified" or "default" or something like that.
cyriltovena
approved these changes
Jun 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I think we might want to also add a pyrosscope to our default config file which scrape itself WDYT ?
simonswine
pushed a commit
to simonswine/pyroscope
that referenced
this pull request
Jun 30, 2023
* chore: Ensure presence of service_name label in grafana agent https://github.com/grafana/phlare/issues/711 fix tests * lint * infer service_name * fix * Fixes the config example --------- Co-authored-by: Cyril Tovena <cyril.tovena@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
grafana/pyroscope#2055