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

wire up scrape_classic_histogram for the prometheus converter #5336

Merged
merged 2 commits into from
Sep 29, 2023
Merged

wire up scrape_classic_histogram for the prometheus converter #5336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaafc04
wire up scrape_classic_histogram for the prometheus converter
erikbaranowski Sep 29, 2023
77d7c23
put back in properties to false for scrape
erikbaranowski Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions converter/internal/prometheusconvert/scrape.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ func appendPrometheusScrape(pb *prometheusBlocks, scrapeConfig *prom_config.Scra
func validatePrometheusScrape(scrapeConfig *prom_config.ScrapeConfig) diag.Diagnostics {
var diags diag.Diagnostics

if scrapeConfig.ScrapeClassicHistograms {
diags.Add(diag.SeverityLevelError, "unsupported scrape_classic_histograms for scrape_configs")
}

if scrapeConfig.NativeHistogramBucketLimit != 0 {
diags.Add(diag.SeverityLevelError, "unsupported native_histogram_bucket_limit for scrape_configs")
}
Expand All @@ -47,25 +43,25 @@ func toScrapeArguments(scrapeConfig *prom_config.ScrapeConfig, forwardTo []stora
}

return &scrape.Arguments{
Targets: targets,
ForwardTo: forwardTo,
JobName: scrapeConfig.JobName,
HonorLabels: scrapeConfig.HonorLabels,
HonorTimestamps: scrapeConfig.HonorTimestamps,
Params: scrapeConfig.Params,
ScrapeInterval: time.Duration(scrapeConfig.ScrapeInterval),
ScrapeTimeout: time.Duration(scrapeConfig.ScrapeTimeout),
MetricsPath: scrapeConfig.MetricsPath,
Scheme: scrapeConfig.Scheme,
BodySizeLimit: scrapeConfig.BodySizeLimit,
SampleLimit: scrapeConfig.SampleLimit,
TargetLimit: scrapeConfig.TargetLimit,
LabelLimit: scrapeConfig.LabelLimit,
LabelNameLengthLimit: scrapeConfig.LabelNameLengthLimit,
LabelValueLengthLimit: scrapeConfig.LabelValueLengthLimit,
HTTPClientConfig: *ToHttpClientConfig(&scrapeConfig.HTTPClientConfig),
ExtraMetrics: false,
Clustering: scrape.Clustering{Enabled: false},
Targets: targets,
ForwardTo: forwardTo,
JobName: scrapeConfig.JobName,
HonorLabels: scrapeConfig.HonorLabels,
HonorTimestamps: scrapeConfig.HonorTimestamps,
Params: scrapeConfig.Params,
ScrapeClassicHistograms: scrapeConfig.ScrapeClassicHistograms,
ScrapeInterval: time.Duration(scrapeConfig.ScrapeInterval),
ScrapeTimeout: time.Duration(scrapeConfig.ScrapeTimeout),
MetricsPath: scrapeConfig.MetricsPath,
Scheme: scrapeConfig.Scheme,
BodySizeLimit: scrapeConfig.BodySizeLimit,
SampleLimit: scrapeConfig.SampleLimit,
TargetLimit: scrapeConfig.TargetLimit,
LabelLimit: scrapeConfig.LabelLimit,
LabelNameLengthLimit: scrapeConfig.LabelNameLengthLimit,
LabelValueLengthLimit: scrapeConfig.LabelValueLengthLimit,
HTTPClientConfig: *ToHttpClientConfig(&scrapeConfig.HTTPClientConfig),
Clustering: scrape.Clustering{Enabled: false},
}
}

Expand Down
1 change: 0 additions & 1 deletion converter/internal/prometheusconvert/testdata/unsupported.diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
(Error) unsupported rule_files config was provided
(Error) unsupported HTTP Client config no_proxy was provided
(Error) unsupported service discovery nomad was provided
(Error) unsupported scrape_classic_histograms for scrape_configs
(Error) unsupported native_histogram_bucket_limit for scrape_configs
(Error) unsupported storage config was provided
(Error) unsupported tracing config was provided
Expand Down
5 changes: 3 additions & 2 deletions converter/internal/prometheusconvert/testdata/unsupported.river
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ prometheus.scrape "prometheus2" {
targets = [{
__address__ = "localhost:9091",
}]
forward_to = [prometheus.remote_write.default.receiver]
job_name = "prometheus2"
forward_to = [prometheus.remote_write.default.receiver]
job_name = "prometheus2"
scrape_classic_histogram = true
}

prometheus.remote_write "default" {
Expand Down